]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'devicetree-current/devicetree/merge'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Nov 2011 01:53:36 +0000 (12:53 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Nov 2011 01:53:36 +0000 (12:53 +1100)
1  2 
include/linux/of.h

Simple merge