1. 05 Aug, 2003 19 commits
  2. 06 Aug, 2003 1 commit
  3. 05 Aug, 2003 3 commits
  4. 06 Aug, 2003 1 commit
  5. 05 Aug, 2003 8 commits
  6. 04 Aug, 2003 8 commits
    • Linus Torvalds's avatar
      Merge bk://kernel.bkbits.net//home/mochel/linux-2.5-power · 32a2a98c
      Linus Torvalds authored
      into home.osdl.org:/home/torvalds/v2.5/linux
      32a2a98c
    • David S. Miller's avatar
      Merge nuts.ninka.net:/home/davem/src/BK/network-2.5 · 27e9295a
      David S. Miller authored
      into nuts.ninka.net:/home/davem/src/BK/net-2.5
      27e9295a
    • David S. Miller's avatar
      Merge nuts.ninka.net:/home/davem/src/BK/sparcwork-2.5 · 6636062c
      David S. Miller authored
      into nuts.ninka.net:/home/davem/src/BK/sparc-2.5
      6636062c
    • Chas Williams's avatar
      [ATM]: Minor LANAI fixes from mitch@sfgoth.com. · 316527f9
      Chas Williams authored
      1. pci_device_id structures shouldn't be __devinitdata.  Greg removed
         all of the instances of this in the 2.6.0-test1 tree, but unforunately
         my recent coversion of lanai.c introduced another one.
      
      2. The lanai PCI id constants have now been merged into the kernel headers
         so we don't need to define our own copies.
      
      3. The ioctl's exported by lanai shouldn't be - they were intended for
         debugging only, never for release.  For now they're just '#if 0'ed out.
         They're somewhat dangerous since they don't check any capabilities so
         any user could DoS the interface.
      316527f9
    • Patrick Mochel's avatar
      [power] Make sure ACPI prepares a console during S3. · c4e3aa81
      Patrick Mochel authored
      Orginally from Pavel Machek.
      c4e3aa81
    • Patrick Mochel's avatar
      [power] Divorce suspend console code from swsusp. · 2e4208cd
      Patrick Mochel authored
      - Create kernel/power/console.c
      - Rename prepare_suspend_console() to pm_prepare_console() and 
        restore_console() to pm_restore_console().
      - Add prototypes to include/linux/suspend.h.
      - Make kernel/power/console.o dependent only on CONFIG_PM
      - Simplify logic for SUSPEND_CONSOLE define
      - Make software_resume() prepare console much earlier, so we can localize
        the loglevel variables in console.c. 
      - Remove #ifdef CONFIG_VT from console.c, and just check for SUSPEND_CONSOLE.
        (Perhaps we should make entire file dependent on CONFIG_VT_CONSOLE?)
      - Add kernel/power/power.h to share things across local files.
      2e4208cd
    • Angelo Dell\'Aera's avatar
      [NET]: Trivial fix for 82596 driver. · 6c0e2636
      Angelo Dell\'Aera authored
      6c0e2636
    • Patrick Mochel's avatar
      [power] Minor swsusp cleanups. · 5847d6c1
      Patrick Mochel authored
      - Call blk_run_queues() from do_software_suspend() directly, instead of 
        wrapping it in helper function.
      - Get rid of ominous compiler warning. 
      - Change BUG_ON(in_interrupt()) to might_sleep() in software_suspend(), so
        we still get back trace, but don't actually BUG().
      
      Orginally from Pavel Machek.
      5847d6c1