summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/apm_32.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jb...Linus Torvalds2008-07-161-4/+4
|\
| * Introduce new top level suspend and hibernation callbacksRafael J. Wysocki2008-06-101-4/+4
* | Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6Linus Torvalds2008-07-141-0/+4
|\ \
| * | apm_32: BKL pushdownArnd Bergmann2008-06-201-0/+4
| |/
* | x86: Switch apm to unlocked_kernelAlan Cox2008-05-251-10/+15
|/
*---. Merge branches 'release', 'acpica', 'bugzilla-10224', 'bugzilla-9772', 'bugzi...Len Brown2008-04-301-20/+4
|\ \ \
| | | * PM: arch/x86/kernel/apm_32.c: fix build warningAndrew Morton2008-04-151-1/+0
| | | * PM: Remove legacy PMPavel Machek2008-04-151-15/+0
| |_|/ |/| |
| * | fix idle (arch, acpi and apm) and lockdepPeter Zijlstra2008-04-271-0/+3
| |/
| * x86: switch to proc_create()Alexey Dobriyan2008-04-171-4/+1
|/
* x86: isolate PIC/PIT in/out callsAlan Cox2008-01-301-3/+3
* x86: get rid of checkpatch.pl complains on apm_32.cCyrill Gorcunov2008-01-301-170/+196
* arch/x86/kernel/apm_32.c: use time_before, time_before_eq,Julia Lawall2008-01-301-1/+2
* x86: unify desc_structGlauber de Oliveira Costa2008-01-301-1/+1
* x86: move 8259 defines to i8259.hThomas Gleixner2008-01-301-2/+0
* PM: ACPI and APM must not be enabled at the same timeLen Brown2008-01-111-7/+3
* spelling fixes: arch/i386/Simon Arlott2007-10-201-1/+1
* Merge branch 'dmi-const' of git://git.kernel.org/pub/scm/linux/kernel/git/jga...Linus Torvalds2007-10-111-9/+9
* i386: move kernelThomas Gleixner2007-10-111-0/+2403
OpenPOWER on IntegriCloud