Merge remote-tracking branch 'pm/linux-next'

diff --cc arch/arm/mach-shmobile/board-mackerel.c
Simple merge

diff --cc arch/arm/mach-shmobile/setup-sh7372.c
Simple merge

diff --cc drivers/net/ethernet/intel/e1000e/netdev.c
Simple merge

diff --cc include/linux/netdevice.h
Simple merge

diff --cc net/mac80211/main.c
Simple merge