| commit | dcf7ec5ee62a78123057a1e286c88ca739717409 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Mon Jan 09 16:16:29 2012 +0000 |
| committer | Arnd Bergmann <arnd@arndb.de> | Mon Jan 09 16:16:29 2012 +0000 |
| tree | fa3f19434638a942ba66d236dde4d9aaadf8b370 | |
| parent | 15db3e823c3246e3bd31fe454f5c8927eb85caf2 [diff] | |
| parent | 142f2101a86ade2d6c9dfbedf82e1b5b31c8fce6 [diff] |
Merge branch 'samsung/driver' into next/drivers Conflicts: arch/arm/mach-mxs/include/mach/common.h Pull in previous samsung conflict merges and do a trivial merge of an mxs double-add conflict. Signed-off-by: Arnd Bergmann <arnd@arndb.de>