| commit | 0dac723e5c15ddb9bd26c1db21ee64ab71ae4925 | |
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | |
| Thu, 5 Jul 2007 22:55:00 +0000 (5 15:55 -0700) | ||
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | |
| Thu, 5 Jul 2007 22:55:00 +0000 (5 15:55 -0700) | ||
| tree | ce19d6114a07cf32c821090c5f7b53685cff28a0 | treesnapshot (tar.gz zip) |
| parent | 87a927c715789853cc8331d76039a2fd657a832a | commitdiff |
| parent | 795bb15e0735bd2b0015ca333fa157399b72c168 | commitdiff |
Merge branch 'merge' of git://git./linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Update defconfigs
[POWERPC] Uninline and export virq_to_hw() for the pasemi_mac driver
[POWERPC] Fix PMI breakage in cbe_cbufreq driver
[POWERPC] Disable old EMAC driver in arch/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Update defconfigs
[POWERPC] Uninline and export virq_to_hw() for the pasemi_mac driver
[POWERPC] Fix PMI breakage in cbe_cbufreq driver
[POWERPC] Disable old EMAC driver in arch/powerpc