summaryrefslogtreecommitdiffstats
path: root/security/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-08-15 21:47:16 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-15 21:47:16 +0200
commit40a342664078ebcb4006a89af96f7982fac36032 (patch)
treee8bcaac5a116ab9a95ffa5d04046b0aa2159d59e /security/Makefile
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiw... (diff)
parentMerge branch 'cpuidle' into release-2.6.27 (diff)
downloadlinux-40a342664078ebcb4006a89af96f7982fac36032.tar.xz
linux-40a342664078ebcb4006a89af96f7982fac36032.zip
Merge branch 'release-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-acpi-2.6
* 'release-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-acpi-2.6: cpuidle: Make ladder governor honor latency requirements fully cpuidle: Menu governor fix wrong usage of measured_us cpuidle: Do not use poll_idle unless user asks for it x86: Fix ioremap off by one BUG
Diffstat (limited to 'security/Makefile')
0 files changed, 0 insertions, 0 deletions