git.openpandora.org / pandora-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 285eba5 3a09b1b)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorPaul Mundt <lethal@linux-sh.org>
Wed, 4 Aug 2010 02:56:17 +0000 (11:56 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Wed, 4 Aug 2010 02:56:17 +0000 (11:56 +0900)
commit701ec7a7b04a62c74ab1b83b59a3fd35c0ba5fdb
treec07aa954f48ec45c422641052d46008697a4a6b1tree | snapshot
parent285eba57db7bd7d7c3c5929fb8621fdcaaea1b00commit | diff
parent3a09b1be53d23df780a0cd0e4087a05e2ca4a00ccommit | diff
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6

Conflicts:
arch/arm/configs/ap4evb_defconfig
arch/arm/configs/g3evm_defconfig
arch/arm/configs/g4evm_defconfig

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
MAINTAINERS diff1 | diff2 | blob | history
arch/arm/mach-shmobile/Kconfig diff1 | diff2 | blob | history
arch/arm/mach-shmobile/include/mach/irqs.h diff1 | diff2 | blob | history
Pandora Kernel Repository