]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'chrome-platform/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Nov 2015 02:11:52 +0000 (13:11 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Nov 2015 02:11:52 +0000 (13:11 +1100)
1  2 
fs/sysfs/group.c
include/linux/sysfs.h

Simple merge
Simple merge