linux/include/uapi
Chris Mason b2c6b3e061 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-next into for-linus-3.9
Signed-off-by: Chris Mason <chris.mason@fusionio.com>

Conflicts:
	fs/btrfs/disk-io.c
2013-02-20 14:05:45 -05:00
..
asm-generic Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal 2012-12-20 18:05:28 -08:00
drm drm/exynos: consider both case of vflip and hflip. 2013-01-04 15:54:33 +09:00
linux Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-next into for-linus-3.9 2013-02-20 14:05:45 -05:00
mtd UAPI: (Scripted) Disintegrate include/mtd 2012-10-09 09:49:09 +01:00
rdma UAPI: (Scripted) Disintegrate include/rdma 2012-11-22 00:43:10 -08:00
scsi UAPI: (Scripted) Set up UAPI Kbuild files 2012-10-02 18:01:35 +01:00
sound ALSA: Extend chmap definitions for UAC2 2012-11-26 16:18:59 +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