Takashi Iwai 87af0b80c9 Merge branch 'for-linus' into for-next ... Merge the recent HD-audio codec change for fixing recursive suspend calls. Conflicts: sound/pci/hda/hda_codec.c		2012-11-19 21:25:27 +01:00
..
asm-generic	UAPI: Put a comment into uapi/asm-generic/kvm_para.h and use it from arches	2012-10-17 12:32:07 +01:00
drm	UAPI: (Scripted) Disintegrate include/drm	2012-10-04 18:21:50 +01:00
linux	revert "epoll: support for disabling items, and a self-test app"	2012-11-09 06:41:46 +01:00
mtd	UAPI: (Scripted) Disintegrate include/mtd	2012-10-09 09:49:09 +01:00
rdma	UAPI: (Scripted) Set up UAPI Kbuild files	2012-10-02 18:01:35 +01:00
scsi	UAPI: (Scripted) Set up UAPI Kbuild files	2012-10-02 18:01:35 +01:00
sound	ALSA: core: fix 64-bit SNDRV_PCM_IOCTL_STATUS ABI breakage	2012-10-28 09:52:37 +01:00
video	UAPI: (Scripted) Set up UAPI Kbuild files	2012-10-02 18:01:35 +01:00
xen	UAPI: (Scripted) Disintegrate include/xen	2012-10-09 09:49:15 +01:00
Kbuild	UAPI: (Scripted) Set up UAPI Kbuild files	2012-10-02 18:01:35 +01:00