OSDN Git Service

Merge tag 'v4.0.6' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux...
authorChih-Wei Huang <cwhuang@linux.org.tw>
Tue, 23 Jun 2015 01:44:04 +0000 (09:44 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Tue, 23 Jun 2015 01:44:04 +0000 (09:44 +0800)
commit474d164ef4405d2d6298cab60a4ae77dcd1c9043
tree7802f61054d2a609aa50e7c76e451dfed9ed05a5
parentf563696222652a89f60d7988406e8620547162da
parenta0ce889438e8204b87d1f30f941646636e26837e
Merge tag 'v4.0.6' of git://git./linux/kernel/git/stable/linux-stable into android-4.0

This is the 4.0.6 stable release

Conflicts:
drivers/base/bus.c
drivers/mmc/card/block.c
arch/x86/kernel/process.c
block/genhd.c
drivers/base/bus.c
drivers/hid/hid-ids.h
drivers/mmc/card/block.c
drivers/mmc/core/core.c
drivers/mmc/host/sh_mmcif.c
drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c
include/linux/sched.h
sound/pci/hda/patch_realtek.c