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

Conflicts:
	net/mac80211/main.c

2010-09-09 22:27:33 -07:00

..

acpi

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

2010-09-07 16:00:17 -07:00

asm-generic

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

2010-09-07 14:08:37 -07:00

crypto

…

drm

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

2010-08-23 18:28:03 -07:00

keys

DNS: Separate out CIFS DNS Resolver code

2010-08-05 17:17:51 +00:00

linux

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

2010-09-09 22:27:33 -07:00

math-emu

math-emu: correct test for downshifting fraction in _FP_FROM_INT()

2010-07-20 18:45:14 -07:00

media

V4L/DVB: cx2341x: convert to the control framework

2010-08-08 23:43:05 -03:00

mtd

mtd: Update copyright notices

2010-08-08 20:58:20 +01:00

net

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

2010-09-09 22:27:33 -07:00

pcmcia

pcmcia: use struct resource for PCMCIA devices, part 2

2010-08-03 09:04:16 +02:00

rdma

IB: Rename RAW_ETY to RAW_ETHERTYPE

2010-08-04 10:44:19 -07:00

rxrpc

net: use __packed annotation

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

scsi

scsi: use __uX types for headers exported to user space

2010-08-11 08:59:01 -07:00

sound

ALSA: emu10k1 - delay the PCM interrupts (add pcm_irq_delay parameter)

2010-08-18 15:10:59 +02:00

trace

Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2010-08-24 12:21:49 -07:00

video

include: replace unifdef-y with header-y

2010-08-14 22:26:51 +02:00

xen

xen: pvhvm: make it clearer that XEN_UNPLUG_* define bits in a bitfield

2010-08-23 12:01:35 +01:00

Kbuild

…