Evolution-x-devices/kernel_google_b1c1
2
0
Fork 0
mirror of https://github.com/Evolution-X-Devices/kernel_google_b1c1 synced 2026-02-13 13:46:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
4e78eb0dbf867ccf206706ff2af34084f71a99bf
kernel_google_b1c1/include/uapi
History
Pablo Neira Ayuso aadd51aa71 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 
Resolve conflicts between 5888b93 ("Merge branch 'nf-hook-compress'") and
Florian Westphal br_netfilter works.

Conflicts:
        net/bridge/br_netfilter.c

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
2015-04-08 18:30:21 +02:00
..
asm-generic
…
drm
…
linux
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-04-08 18:30:21 +02:00
misc
…
mtd
…
rdma
…
scsi
…
sound
…
video
…
xen
…
Kbuild
…