Merge remote-tracking branch 'parisc-hd/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Nov 2015 23:33:36 +0000 (10:33 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Nov 2015 23:33:36 +0000 (10:33 +1100)
1  2 
include/linux/netdevice.h

Simple merge