iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/drivers
History
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
[SPARC]: Kill __irq_itoa().
2006-06-20 01:21:29 -07:00
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
[PATCH] pcmcia: use bitfield instead of p_state and state
2006-03-31 17:26:33 +02:00
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
[CRYPTO] api: Align tfm context as wide as possible
2006-03-21 20:14:08 +11:00
dio
[PATCH] hp300: fix driver_register() return handling, remove dio_module_init()
2006-03-25 08:22:53 -08:00
dma
[I/OAT]: Do not use for_each_cpu().
2006-06-17 21:25:58 -07:00
edac
[PATCH] EDAC Coexistence with BIOS
2006-05-03 20:05:41 -07:00
eisa
[PATCH] EISA: Ignore generated file drivers/eisa/devlist.h
2006-03-25 08:23:01 -08:00
fc4
[SPARC]: Kill __irq_itoa().
2006-06-20 01:21:29 -07:00
firmware
[PATCH] DMI: move dmi_scan.c from arch/i386 to drivers/firmware/
2006-04-14 11:41:25 -07:00
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
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2006-06-21 11:18:25 -07:00
mfd
[PATCH] show MCP menu only on ARCH_SA1100
2006-03-24 07:33:28 -08:00
misc
[PATCH] VFS: Permit filesystem to override root dentry on mount
2006-06-23 07:42:45 -07:00
mmc
[ARM] 3565/1: AT91RM9200 MMC update
2006-06-19 13:06:05 +01:00
mtd
[MTD] NAND: Fix breakage all over the place
2006-06-20 20:31:24 +01:00
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
[PARISC] Document that we tolerate "Relaxed Ordering"
2006-04-21 22:20:33 +00:00
parport
[PATCH] Remove CONFIG_PARPORT_ARC, drivers/parport/parport_arc.c
2006-06-23 07:43:03 -07:00
pci
[PATCH] PCI: nVidia quirk to make AER PCI-E extended capability visible
2006-06-21 12:00:01 -07:00
pcmcia
[ARM] Fix badge4 build error
2006-06-19 15:37:31 +01:00
pnp
Pull pnpacpi into release branch
2006-06-15 15:36:43 -04:00
rapidio
…
rtc
[PATCH] m48t86: ia64 build fix
2006-06-05 12:29:17 -07:00
s390
[NET]: Merge TSO/UFO fields in sk_buff
2006-06-23 02:07:29 -07:00
sbus
[SPARC]: Kill __irq_itoa().
2006-06-20 01:21:29 -07:00
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
[PATCH] s3c24xx: fix spi driver with CONFIG_PM
2006-05-26 11:55:46 -07:00
tc
[PATCH] kill _INLINE_
2006-03-23 07:38:16 -08:00
telephony
[PATCH] pcmcia: use bitfield instead of p_state and state
2006-03-31 17:26:33 +02:00
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
[PATCH] amiga: fix driver_register() return handling, remove zorro_module_init()
2006-03-25 08:22:53 -08:00
Kconfig
[I/OAT]: DMA memcpy subsystem
2006-06-17 21:18:43 -07:00
Makefile
[I/OAT]: DMA memcpy subsystem
2006-06-17 21:18:43 -07:00