]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'gpio/gpio/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Mar 2013 03:26:16 +0000 (14:26 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Mar 2013 03:26:16 +0000 (14:26 +1100)
1  2 
include/linux/mfd/palmas.h

Simple merge