黄涛 6e2688ca84 Merge remote branch 'linux-2.6.32.y/master' into develop ... Conflicts: drivers/i2c/busses/Kconfig drivers/net/dm9000.c drivers/net/wireless/libertas/if_sdio1.c drivers/usb/serial/option.c net/bluetooth/rfcomm/core.c		2010-12-16 20:54:24 +08:00
..
acpi	ACPI: skip checking BM_STS if the BIOS doesn't ask for it	2010-08-02 10:21:24 -07:00
asm-generic	Merge remote branch 'linux-2.6.32.y/master' into develop	2010-12-16 20:54:24 +08:00
crypto	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2009-09-11 09:38:37 -07:00
drm	drm/radeon: fix PCI ID 5657 to be an RV410	2010-10-28 21:44:06 -07:00
keys	RxRPC: Use uX/sX rather than uintX_t/intX_t types	2009-09-16 00:01:13 -07:00
linux	Merge remote branch 'linux-2.6.32.y/master' into develop	2010-12-16 20:54:24 +08:00
math-emu	math-emu: correct test for downshifting fraction in _FP_FROM_INT()	2010-08-02 10:20:44 -07:00
media	camera: add ov2659 driver,but have not debug	2010-12-01 19:10:06 +08:00
mtd
net	Merge remote branch 'linux-2.6.32.y/master' into develop	2010-12-16 20:54:24 +08:00
pcmcia	PM / yenta: Split resume into early and late parts (rev. 4)	2009-11-03 10:54:58 +01:00
rdma	trivial: fix typo "to to" in multiple files	2009-09-21 15:14:55 +02:00
rxrpc
scsi	SCSI: fc-transport: Use packed modifier for fc_bsg_request structure.	2010-04-26 07:41:30 -07:00
sound	Merge remote branch 'linux-2.6.32.y/master' into develop	2010-12-16 20:54:24 +08:00
trace	tracing: Fix ftrace_event_call alignment for use with gcc 4.5	2010-05-12 14:57:14 -07:00
video	davinci-fb-frame-buffer-driver-for-ti-da8xx-omap-l1xx-v4	2009-09-23 07:39:51 -07:00
xen
Kbuild