]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge commit 'refs/next/20111214/regmap'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Dec 2011 05:53:13 +0000 (16:53 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Dec 2011 05:53:18 +0000 (16:53 +1100)
commit6f6a6938664306a5caaf034f19b7fa59d57bc3b0
tree31525aa64402def56e8d284ce155c0f597ff3c28
parenta9bd00479e463a2c1839c6c71ad0066a4f71a1cf
parent681ba97d9fbff59f67c71f1d9a88ad0b8ef49d25
Merge commit 'refs/next/20111214/regmap'

Conflicts:
drivers/base/regmap/regcache.c
drivers/base/regmap/regmap.c
drivers/gpio/Kconfig