James Morris 2b82892565 Merge branch 'master' into next ...

Conflicts:
	security/keys/internal.h
	security/keys/process_keys.c
	security/keys/request_key.c

Fixed conflicts above by using the non 'tsk' versions.

Signed-off-by: James Morris <jmorris@namei.org>

2008-11-14 11:29:12 +11:00

..

aoe

[PATCH] switch aoeblk

2008-10-21 07:47:40 -04:00

paride

[PATCH] switch pf

2008-10-21 07:47:59 -04:00

amiflop.c

[PATCH] switch amiflop

2008-10-21 07:47:38 -04:00

ataflop.c

[PATCH] switch ataflop

2008-10-21 07:47:42 -04:00

brd.c

[PATCH] switch brd

2008-10-21 07:47:44 -04:00

cciss_cmd.h

[PATCH] cciss: add support for 1024 logical volumes

2006-12-07 08:39:30 -08:00

cciss_scsi.c

cciss: Fix cciss SCSI rescan code to better notice device changes

2008-10-09 08:56:18 +02:00

cciss_scsi.h

cciss: Fix cciss SCSI rescan code to better notice device changes

2008-10-09 08:56:18 +02:00

cciss.c

cciss: fix regression firmware not displayed in procfs

2008-11-06 15:41:18 -08:00

cciss.h

cciss: make rebuild_lun_table behave better

2008-08-06 12:30:03 +02:00

cpqarray.c

cpqarry: fix return value of cpqarray_init()

2008-11-06 15:41:17 -08:00

cpqarray.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

cryptoloop.c

drivers: Remove unnecessary inclusions of asm/semaphore.h

2008-04-18 22:16:32 -04:00

DAC960.c

[PATCH] switch DAC960

2008-10-21 07:47:36 -04:00

DAC960.h

Fix DAC960 driver on machines which don't support 64-bit DMA

2007-09-11 17:21:19 -07:00

floppy.c

[PATCH] switch floppy

2008-10-21 07:47:49 -04:00

hd.c

hd: WIN_* -> ATA_CMD_*

2008-10-10 22:39:21 +02:00

ida_cmd.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

ida_ioctl.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

Kconfig

update the BLK_DEV_HD help text

2008-07-16 20:33:47 +02:00

loop.c

CRED: Wrap task credential accesses in the block loopback driver

2008-11-14 10:38:41 +11:00

Makefile

move ide/legacy/hd.c to drivers/block/

2008-07-16 20:33:47 +02:00

nbd.c

[PATCH] switch nbd

2008-10-21 07:47:53 -04:00

pktcdvd.c

[PATCH] sanitize blkdev_get() and friends

2008-10-21 07:49:06 -04:00

ps3disk.c

block: don't depend on consecutive minor space

2008-10-09 08:56:05 +02:00

smart1,2.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

sunvdc.c

sparc64: Apply const or __initdata to vio_device_id[]

2008-09-01 01:48:52 -07:00

swim3.c

[PATCH] switch swim3

2008-10-21 07:48:03 -04:00

sx8.c

block: replace remaining __FUNCTION__ occurrences

2008-04-21 09:51:04 +02:00

ub.c

[PATCH] switch ub

2008-10-21 07:48:05 -04:00

umem.c

Cleanup umem driver: fix most checkpatch warnings, conform to kernel

2007-12-18 08:29:28 +01:00

umem.h

drivers/block/umem: trim trailing whitespace

2007-10-10 09:25:59 +02:00

viodasd.c

[PATCH] switch viodasd

2008-10-21 07:48:07 -04:00

virtio_blk.c

[PATCH] switch virtio_blk

2008-10-21 07:48:09 -04:00

xd.c

[PATCH] switch xd

2008-10-21 07:48:11 -04:00

xd.h

[PATCH] switch xd

2008-10-21 07:48:11 -04:00

xen-blkfront.c

[PATCH] switch xen

2008-10-21 07:48:13 -04:00

xsysace.c

[PATCH] switch xyspace

2008-10-21 07:48:15 -04:00

z2ram.c

[PATCH] switch z2ram

2008-10-21 07:48:17 -04:00