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

Conflicts:
	include/linux/if_pppox.h

Fix conflict between Changli's __packed header file fixes and
the new PPTP driver.

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

2010-08-22 22:37:04 -07:00

..

acpi

Merge branch 'linus' into release

2010-08-15 01:06:31 -04:00

asm-generic

Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

2010-08-15 17:31:43 -07:00

crypto

…

drm

include: replace unifdef-y with header-y

2010-08-14 22:26:51 +02: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-08-22 22:37:04 -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

irda: use net_device_stats from struct net_device

2010-08-21 23:32:31 -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

…

scsi

scsi: use __uX types for headers exported to user space

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

sound

include: replace unifdef-y with header-y

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

trace

Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block

2010-08-10 15:22:42 -07:00

video

include: replace unifdef-y with header-y

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

xen

Merge branch 'stable/xen-swiotlb-0.8.6' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

2010-08-12 09:09:41 -07:00

Kbuild

…