android_kernel_xiaomi_sm7250/include
David S. Miller 730c30ec64 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:

	drivers/net/wireless/iwlwifi/iwl-core.c
	drivers/net/wireless/iwlwifi/iwl-sta.c
2008-12-05 22:54:40 -08:00
..
acpi ACPICA: disable _BIF warning 2008-11-27 02:17:30 -05:00
asm-arm
asm-frv
asm-generic
asm-h8300
asm-m32r
asm-m68k
asm-mn10300
asm-xtensa
crypto
drm drm: move drm vblank initialization/cleanup to driver load/unload 2008-11-25 09:49:03 +10:00
keys
linux Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-12-05 22:54:40 -08:00
math-emu
media
mtd
net mac80211: document ieee80211_tx_info.pad 2008-12-05 09:35:45 -05:00
pcmcia
rdma
rxrpc
scsi [SCSI] fc_transport: fix old bug on bitflag definitions 2008-11-21 17:30:53 +09:00
sound
trace
video atmel_lcdfb: change irq_base definition to allow error reporting 2008-11-12 17:17:16 -08:00
xen
Kbuild