Patrick McHardy f9181f4ffc Merge branch 'master' of /repos/git/net-next-2.6 ...

Conflicts:
	include/net/netfilter/xt_rateest.h
	net/bridge/br_netfilter.c
	net/netfilter/nf_conntrack_core.c

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

2010-06-15 17:31:06 +02:00

..

acpi

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

2010-05-28 14:42:18 -07:00

asm-generic

numa: introduce numa_mem_id()- effective local memory node id

2010-05-27 09:12:57 -07:00

crypto

crypto: skcipher - Add ablkcipher_walk interfaces

2010-05-19 14:13:07 +10:00

drm

Merge branch 'drm-for-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

2010-05-21 11:14:52 -07:00

keys

…

linux

Merge branch 'master' of /repos/git/net-next-2.6

2010-06-15 17:31:06 +02:00

math-emu

Fix misspellings of "truly" in comments.

2010-02-04 11:55:45 +01:00

media

V4L/DVB: v4l2-subdev.h: Add support for enum_dv_preset

2010-05-19 12:59:01 -03:00

mtd

…

net

Merge branch 'master' of /repos/git/net-next-2.6

2010-06-15 17:31:06 +02:00

pcmcia

pcmcia: remove unused mem_op.h

2010-05-10 10:23:20 +02:00

rdma

IB/core: Allow device-specific per-port sysfs files

2010-05-21 10:34:44 -07:00

rxrpc

net: use __packed annotation

2010-06-03 03:21:52 -07:00

scsi

[SCSI] libfc: Move the port_id into lport

2010-05-16 22:22:34 -04:00

sound

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

2010-05-20 09:41:44 -07:00

trace

drop unused dentry argument to ->fsync

2010-05-27 22:05:02 -04:00

video

fbdev: move FBIO_WAITFORVSYNC to linux/fb.h

2010-05-25 08:07:09 -07:00

xen

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

Kbuild

…