Merge remote-tracking branch 'trivial/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 02:12:24 +0000 (13:12 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 02:12:24 +0000 (13:12 +1100)
1  2 
drivers/block/pktcdvd.c
drivers/net/ethernet/ti/netcp_core.c
drivers/scsi/Kconfig
fs/ext4/extents.c
fs/ext4/namei.c
fs/namei.c
mm/huge_memory.c
net/openvswitch/datapath.c

Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/ext4/namei.c
Simple merge
diff --cc fs/namei.c
Simple merge
Simple merge
Simple merge