summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-09 22:50:25 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-09 22:50:25 +0200
commitdfb863a714b81848504d3b73ca0ecae90b91cbc0 (patch)
tree7a51963defa6222079143684fceb91f4d7883808 /Makefile
parentMerge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff)
parentpowerpc: Force page alignment for initrd reserved memory (diff)
downloadlinux-dfb863a714b81848504d3b73ca0ecae90b91cbc0.tar.xz
linux-dfb863a714b81848504d3b73ca0ecae90b91cbc0.zip
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc: Force page alignment for initrd reserved memory dtc/powerpc: remove obsolete .gitignore entries powerpc/85xx: fix race bug of calling request_irq after enable elbc interrupts powerpc/book3e: Fix CPU feature handling on e5500 in 32-bit mode powerpc/fsl_rio: Fix compile error when CONFIG_FSL_RIO not set
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions