summaryrefslogtreecommitdiffstats
path: root/net/llc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-08-04 09:54:15 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-08-04 09:54:15 +0200
commit35e51fe82ddcd8fb7f129d6dd8491c097d388665 (patch)
treed6dd5e860c0e68a1af7976990c7d624e7362415d /net/llc
parentMerge branch 'apei-release' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff)
parentcpuidle: stop depending on pm_idle (diff)
downloadlinux-35e51fe82ddcd8fb7f129d6dd8491c097d388665.tar.xz
linux-35e51fe82ddcd8fb7f129d6dd8491c097d388665.zip
Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6
* 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6: cpuidle: stop depending on pm_idle x86 idle: move mwait_idle_with_hints() to where it is used cpuidle: replace xen access to x86 pm_idle and default_idle cpuidle: create bootparam "cpuidle.off=1" mrst_pmu: driver for Intel Moorestown Power Management Unit
Diffstat (limited to 'net/llc')
0 files changed, 0 insertions, 0 deletions