diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 17:18:30 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 17:18:30 +0100 |
| commit | cf1fb2dfa7601770037d24a328f259e2cfd97fb0 (patch) | |
| tree | 1a38c170cc73ca9fa02b69a3194f487b0c1ef55c /fs/lockd/mon.c | |
| parent | ARM: ux500: fix pin warning (diff) | |
| parent | ARM: OMAP: Remove omap_init_consistent_dma_size() (diff) | |
| download | linux-cf1fb2dfa7601770037d24a328f259e2cfd97fb0.tar.xz linux-cf1fb2dfa7601770037d24a328f259e2cfd97fb0.zip | |
Merge branch 'omap/headers4' into next/drivers
This avoids merge conflicts between the omap header changes and the gpmc
updates.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'fs/lockd/mon.c')
0 files changed, 0 insertions, 0 deletions