]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'driver-core/driver-core-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 04:30:39 +0000 (14:30 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 04:30:39 +0000 (14:30 +1000)
1  2 
drivers/staging/android/Kconfig
lib/kobject.c

Simple merge
diff --cc lib/kobject.c
Simple merge