projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 19ec6ca 878040e)
Merge branch 'testing/bcmring' into next/cleanups
authorArnd Bergmann <arnd@arndb.de>
Mon, 13 Aug 2012 15:01:31 +0000 (17:01 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 13 Aug 2012 15:01:31 +0000 (17:01 +0200)
commita4c75ba85cecd7ee3a54737af28836567efa7448
tree9fe06f0291ee23662b5f004ce8876e8c26509c0ctree | snapshot
parent19ec6caca2da706f11646249ba280177fec359facommit | diff
parent878040ef831a12855af26a42cc25c817f4fb3f2dcommit | diff
Merge branch 'testing/bcmring' into next/cleanups

This attempts to get the bcmring platform better in line with the
other platforms. Moving the header files below mach/ helps with
the future reorganization for multiplatform kernels, and using
MMIO accessors is generally the right thing.

* testing/bcmring:
  ARM: bcmring: use proper MMIO accessors
  ARM: bcmring: remove include/csp/ subdir
  ARM: bcmring: move cfg_global header to mach/

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
drivers/mtd/nand/bcm_umi_nand.c diff1 | diff2 | blob | history
ep93xx device tree rework repo: git://git.maquefel.me/linux.git