diff options
author | 2012-01-07 12:44:37 +0000 | |
---|---|---|
committer | 2012-01-07 20:40:51 +0000 | |
commit | b001befe58691ef3627458cd814e8cee7f845c5f (patch) | |
tree | 1083f1a1cd3feeceeac4b395534df0ff032fdbc8 /drivers/gpio | |
parent | Merge branch 'samsung/dt' into next/dt (diff) | |
parent | Merge branch 'next/cleanup' into samsung/dt (diff) | |
download | linux-b001befe58691ef3627458cd814e8cee7f845c5f.tar.gz linux-b001befe58691ef3627458cd814e8cee7f845c5f.tar.bz2 linux-b001befe58691ef3627458cd814e8cee7f845c5f.zip |
Merge branch 'samsung/dt' into next/dt
* samsung/dt: (3 commit)
Merge branch 'depends/rmk/for-linus' into samsung/dt
Merge branch 'depends/rmk/restart' into next/cleanup
Merge branch 'next/cleanup' into samsung/dt
Conflicts:
arch/arm/mach-tegra/board-dt.c
arch/arm/mach-tegra/include/mach/entry-macro.S
The latest version of the samsung/dt branch resolves
all sorts of conflicts with the latest upstream, no functional
changes that are not already there.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/gpio')
0 files changed, 0 insertions, 0 deletions