David S. Miller bb7e95c8fd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	drivers/net/bnx2x_main.c

Merge bnx2x bug fixes in by hand... :-/

Signed-off-by: David S. Miller <davem@davemloft.net>

2010-07-27 21:01:35 -07: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

…

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 master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-07-27 21:01:35 -07:00

math-emu

…

media

…

mtd

…

net

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-07-27 21:01:35 -07:00

pcmcia

…

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

…

sound

…

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

…

Kbuild

…