tree c07aa954f48ec45c422641052d46008697a4a6b1
parent 285eba57db7bd7d7c3c5929fb8621fdcaaea1b00
parent 3a09b1be53d23df780a0cd0e4087a05e2ca4a00c
author Paul Mundt <lethal@linux-sh.org> 1280890577 +0900
committer Paul Mundt <lethal@linux-sh.org> 1280890577 +0900

Merge branch 'master' of git://git.kernel.org/pub/scm/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>