David S. Miller f24001941c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Fix merge between commit 3adadc08cc1e ("net ax25: Reorder ax25_exit to
remove races") and commit 0ca7a4c87d27 ("net ax25: Simplify and
cleanup the ax25 sysctl handling")

The former moved around the sysctl register/unregister calls, the
later simply removed them.

With help from Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>

2012-04-23 23:15:17 -04:00

..

aoe

switch device_get_devnode() and ->devnode() to umode_t *

2012-01-03 22:54:55 -05:00

drbd

sock: Introduce named constants for sk_reuse

2012-04-21 15:52:25 -04:00

mtip32xx

block: mtip32xx: remove HOTPLUG_PCI_PCIE dependancy

2012-04-12 08:47:05 +02:00

paride

paride/pcd: fix bool verbose module parameter.

2012-01-13 09:32:26 +10:30

xen-blkback

xen/blkback: Fix warning error.

2012-04-18 15:54:08 -04:00

amiflop.c

fs: move code out of buffer.c

2012-01-03 22:54:07 -05:00

ataflop.c

block: unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe drivers

2011-04-21 21:33:05 +02:00

brd.c

block: remove the second argument of k[un]map_atomic()

2012-03-20 21:48:16 +08:00

cciss_cmd.h

cciss: use new doorbell-bit-5 reset method

2011-05-06 08:23:55 -06:00

cciss_scsi.c

cciss: Fix scsi tape io with more than 255 scatter gather elements

2012-03-22 21:40:09 +01:00

cciss_scsi.h

cciss: add cciss_tape_cmds module paramter

2011-05-06 08:23:59 -06:00

cciss.c

block: add and use scsi_blk_cmd_ioctl

2012-01-14 15:07:24 -08:00

cciss.h

cciss: Adds simple mode functionality

2011-08-08 11:40:15 +02:00

cpqarray.c

drivers/block/cpqarray.c: use pci_dev->revision

2011-09-21 10:02:13 +02: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

drivers/block/DAC960: fix -Wuninitialized warning

2012-03-02 10:48:35 +01: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

x86: Remove the ancient and deprecated disable_hlt() and enable_hlt() facility

2012-03-30 08:50:27 +02:00

hd.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01: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

usb/ub: deprecate & schedule for removal the "Low Performance USB Block" driver

2012-03-16 13:30:10 -07:00

loop.c

block: remove the second argument of k[un]map_atomic()

2012-03-20 21:48:16 +08:00

Makefile

Merge git://git.infradead.org/users/willy/linux-nvme

2012-01-18 12:34:09 -08:00

mg_disk.c

block: switch s390 tape_block and mg_disk to elevator_change()

2010-08-23 14:02:44 +02:00

nbd.c

Merge branch 'akpm' (Andrew's patch-bomb)

2012-03-28 17:19:28 -07:00

nvme.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2012-03-20 21:12:50 -07:00

osdblk.c

block: remove spurious uses of REQ_HARDBARRIER

2010-09-10 12:35:36 +02:00

pktcdvd.c

block: remove the second argument of k[un]map_atomic()

2012-03-20 21:48:16 +08:00

ps3disk.c

block: Fix files that are modules and hence need module.h

2011-10-31 19:31:13 -04:00

ps3vram.c

Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2011-11-06 19:44:47 -08:00

rbd_types.h

rbd: small changes

2012-03-22 10:47:50 -05:00

rbd.c

rbd: move snap_rwsem to the device, rename to header_rwsem

2012-03-22 10:47:52 -05:00

smart1,2.h

fix typos 'comamnd' -> 'command' in comments

2011-02-02 11:31:21 +01:00

sunvdc.c

powerpc+sparc/vio: Modernize driver registration

2012-03-28 11:33:24 +11:00

swim3.c

block/swim3: Locking fixes

2011-12-12 12:42:12 +01:00

swim_asm.S

m68k: mac - Add SWIM floppy support

2009-03-26 21:15:27 +01:00

swim.c

m68k/mac: cleanup forward declarations

2011-12-10 19:52:46 +01:00

sx8.c

block, sx8: fix pointer math issue getting fw version

2012-03-03 19:44:39 +01:00

ub.c

usb/ub: deprecate & schedule for removal the "Low Performance USB Block" driver

2012-03-16 13:30:10 -07:00

umem.c

block: remove support for bio remapping from ->make_request

2011-09-12 12:12:01 +02:00

umem.h

drivers/block/umem: trim trailing whitespace

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

virtio_blk.c

virtio: fixes on top of 3.4-rc2

2012-04-16 18:34:12 -07:00

xd.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

xd.h

[PATCH] switch xd

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

xen-blkfront.c

Merge branch 'for-3.4/drivers' of git://git.kernel.dk/linux-block

2012-04-13 18:45:13 -07:00

xsysace.c

block: xsysace: Don't use NO_IRQ

2012-01-05 08:34:29 +01:00

z2ram.c

drivers/block/z2ram.c: correct printing of sector_t

2010-10-28 06:15:26 -06:00