summaryrefslogtreecommitdiffstats
path: root/arch/cris/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-25 05:24:12 +1000
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-25 05:24:12 +1000
commit4398f31ca7989cbddca96267e3d018d440bac30e (patch)
tree77b59bd0b224107970f18c63299e58ffc63ff532 /arch/cris/kernel
parentd315777b32a4696feb86f2a0c9e9f39c94683649 (diff)
parent8969691343354bdd80eff5405a0f879edbf013d6 (diff)
downloadblackbird-obmc-linux-4398f31ca7989cbddca96267e3d018d440bac30e.tar.gz
blackbird-obmc-linux-4398f31ca7989cbddca96267e3d018d440bac30e.zip
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Fix jump label with RO/NX module protection crash x86, hotplug: Fix powersavings with offlined cores on AMD x86, mcheck, therm_throt.c: Export symbol platform_thermal_notify to allow coretemp to handler intr x86: Use asm-generic/cacheflush.h x86: Update CPU cache attributes table descriptors
Diffstat (limited to 'arch/cris/kernel')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud