Merge remote-tracking branch 'stable/linux-4.9.y' into rpi-4.9.y
authorpopcornmix <popcornmix@gmail.com>
Sun, 13 Aug 2017 12:57:29 +0000 (13:57 +0100)
committerpopcornmix <popcornmix@gmail.com>
Sun, 13 Aug 2017 12:57:29 +0000 (13:57 +0100)
1  2 
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
kernel/cgroup.c
mm/page_alloc.c

diff --cc kernel/cgroup.c
Simple merge
diff --cc mm/page_alloc.c
Simple merge