Patrick McHardy 0134e89c7b Merge branch 'master' of git://1984.lsi.us.es/net-next-2.6 ...

Conflicts:
	net/ipv4/route.c

Signed-off-by: Patrick McHardy <kaber@trash.net>

2011-01-14 14:12:37 +01:00

..

acpi

ACPI: video: fix build for CONFIG_ACPI=n

2010-12-11 02:01:46 -05:00

asm-generic

Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

2011-01-07 17:02:58 -08:00

crypto

…

drm

drm/i915: announce to userspace that the bsd ring is coherent

2010-12-05 10:40:39 +00:00

keys

…

linux

netfilter: ebt_ip6: allow matching on ipv6-icmp types/codes

2011-01-13 12:05:12 +01:00

math-emu

…

media

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

2011-01-06 18:32:12 -08:00

mtd

…

net

Merge branch 'master' of git://1984.lsi.us.es/net-next-2.6

2011-01-14 14:12:37 +01:00

pcmcia

…

rdma

…

rxrpc

…

scsi

[SCSI] libiscsi: do not take host lock in queuecommand

2010-12-31 09:52:44 -06:00

sound

ARM: mach-shmobile: ap4evb: FSI clock use proper process for HDMI

2010-11-24 15:29:56 +09:00

trace

perf: Clean up power events by introducing new, more generic ones

2011-01-04 08:16:54 +01:00

video

Merge branch 'fbdev/udlfb'

2011-01-06 18:10:09 +09:00

xen

xen: Provide a variant of __RING_SIZE() that is an integer constant expression

2010-12-15 12:34:28 -08:00

Kbuild

…