android_kernel_xiaomi_sm8350/drivers
Trond Myklebust 816724e65c Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:

	fs/nfs/inode.c
	fs/super.c

Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'
2006-06-24 13:07:53 -04:00
..
acorn
acpi [PATCH] fix typo in acpi video brightness changes. 2006-06-23 21:37:34 -07:00
amba
atm
base [PATCH] Driver core: fix locking issues with the devices that are attached to classes 2006-06-22 22:54:30 -07:00
block [PATCH] drivers/block/loop.c: don't return garbage if LOOP_SET_STATUS not called 2006-06-23 07:43:09 -07:00
bluetooth
cdrom Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 2006-06-22 22:11:30 -07:00
char Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 2006-06-23 07:52:36 -07:00
connector [PATCH] connector-exports 2006-06-23 07:43:06 -07:00
cpufreq [PATCH] cpufreq build fix 2006-06-23 08:47:27 -07:00
crypto
dio
dma
edac
eisa
fc4
firmware
hwmon [PATCH] hwmon-vid: Add support for Intel Core and Conroe 2006-06-22 11:10:36 -07:00
i2c Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 2006-06-22 22:11:30 -07:00
ide Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev 2006-06-23 15:58:44 -07:00
ieee1394 [PATCH] frv: ieee1394 is borken on frv 2006-06-23 07:42:55 -07:00
infiniband [PATCH] VFS: Permit filesystem to override root dentry on mount 2006-06-23 07:42:45 -07:00
input [PATCH] vfs: add lock owner argument to flush operation 2006-06-23 07:43:02 -07:00
isdn [PATCH] ISDN: correctly handle isdn_writebuf_stub() errors 2006-06-23 07:43:04 -07:00
leds [PATCH] leds: Amstrad Delta LED support 2006-06-23 07:43:05 -07:00
macintosh [PATCH] m68k: windfarm is powerpc-only, don't do it on m68k macs 2006-06-23 07:43:01 -07:00
mca
md [PATCH] drivers/md/raid6algos.c: fix a NULL dereference 2006-06-23 07:43:08 -07:00
media [PATCH] USB: move <linux/usb_input.h> to <linux/usb/input.h> 2006-06-21 15:04:18 -07:00
message
mfd
misc [PATCH] VFS: Permit filesystem to override root dentry on mount 2006-06-23 07:42:45 -07:00
mmc
mtd
net [NET]: Require CAP_NET_ADMIN to create tuntap devices. 2006-06-23 02:07:44 -07:00
nubus
oprofile [PATCH] VFS: Permit filesystem to override root dentry on mount 2006-06-23 07:42:45 -07:00
parisc
parport [PATCH] Remove CONFIG_PARPORT_ARC, drivers/parport/parport_arc.c 2006-06-23 07:43:03 -07:00
pci
pcmcia
pnp
rapidio
rtc
s390 [NET]: Merge TSO/UFO fields in sk_buff 2006-06-23 02:07:29 -07:00
sbus
scsi Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev 2006-06-23 15:58:44 -07:00
serial [PATCH] SGI IOC4: Detect IO card variant 2006-06-23 07:43:07 -07:00
sh
sn [PATCH] SGI IOC4: Detect IO card variant 2006-06-23 07:43:07 -07:00
spi
tc
telephony
usb Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ 2006-06-24 13:07:53 -04:00
video [PATCH] m68k: atyfb_base compile fix for CONFIG_PCI=n 2006-06-23 07:43:00 -07:00
w1 [PATCH] connector-exports 2006-06-23 07:43:06 -07:00
zorro
Kconfig
Makefile