]> git.karo-electronics.de Git - mv-sheeva.git/commit - drivers/net/caif/caif_shm_u5500.c
Merge branches 'rmobile/mmcif', 'rmobile/ag5' and 'rmobile/mackerel' into rmobile...
authorPaul Mundt <lethal@linux-sh.org>
Wed, 5 Jan 2011 08:25:29 +0000 (17:25 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Wed, 5 Jan 2011 08:25:29 +0000 (17:25 +0900)
commit025a10a76808cfd9e55dbf965d0f1453e4f8ae84
tree32f4f73efad9559b4fb83628e4f65d2c6bc062e3
parent6bf45a1018ff3cda8b6ef2fa7e023a023bc01dc8
parentf7dd3611c85f50a98e8f3b9b1d52aaf540ebeb7b
parentc070c203cde0e019cd373d3247137be11961deb3
parentd0fb0c4b3fc9b31cc635e89b6a2f9aaa30bf75db
Merge branches 'rmobile/mmcif', 'rmobile/ag5' and 'rmobile/mackerel' into rmobile-latest

Conflicts:
arch/arm/mach-shmobile/Kconfig

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/board-ap4evb.c
arch/arm/mach-shmobile/clock-sh73a0.c