diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-09 13:50:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-09 13:50:25 -0700 |
| commit | dfb863a714b81848504d3b73ca0ecae90b91cbc0 (patch) | |
| tree | 7a51963defa6222079143684fceb91f4d7883808 /Makefile | |
| parent | 461df4ded3a143f09f9d0e870e7b16b787dc0591 (diff) | |
| parent | 307cfe715344e15eda12dad3bb14f794115ca823 (diff) | |
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