leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
545b29019c
linux/include/uapi
History
David S. Miller 545b29019c Merge branch 'master' of git://1984.lsi.us.es/nf-next 
Conflicts:
	net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c

Minor conflict due to some IS_ENABLED conversions done
in net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-11-16 12:42:43 -05:00
..
asm-generic sk-filter: Add ability to get socket filter program (v2) 2012-11-01 11:17:15 -04:00
drm UAPI: (Scripted) Disintegrate include/drm 2012-10-04 18:21:50 +01:00
linux Merge branch 'master' of git://1984.lsi.us.es/nf-next 2012-11-16 12:42:43 -05: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 UAPI: (Scripted) Set up UAPI Kbuild files 2012-10-02 18:01:35 +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