aboutsummaryrefslogtreecommitdiff
path: root/drivers/block/virtio_blk.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-10-29 08:13:03 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-10-29 08:13:03 -0700
commit464d155c51db3fc31908cef4101c51c11d3f2a45 (patch)
tree47422373c00ffe8a839b6312a9facac0ab4db543 /drivers/block/virtio_blk.c
parentfefcfd431b5181615e7da628e34c5227c895b85a (diff)
parent0996391139f43d032335b5360db11da62a2cbb39 (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: (22 commits) ARM: Fix lubbock defconfig build ARM: 5769/1: CPU_ARM920T: remove dead Maverick EP9312 URL ARM: 5768/1: ep93xx: remove dead code in ep93xx_gpio_ab_irq_handler() ARM: 5767/1: ep93xx: remove ep93xx_init_time() prototype ARM: 5765/1: Updated U300 defconfig ARM: 5766/1: Fix watchdog enabling for AT91SAM9G45 ARM: 5764/1: bcmring: add oprofile pmu support [ARM] pxa/spitz: add gpio button support (fixes regression) [ARM] pxa/cm-x300: fix mmc numbering ARM: 5763/1: ARM: SMP: Fix the BUG with CONFIG_PREEMPT enabled ARM: 5760/1: ep93xx: fix build error in edb93xx.c ARM: 5759/1: Add register information of threads to coredump ARM: 5757/1: Thumb-2: Correct "mov.w pc, lr" instruction which is unpredictable MXC: fix reset for mx31, mx35 and mx27 SoCs fix pcm037_eet compilation with the new SPI driver fix compilation of i.MX31 platforms pcm970 mmc: Fix ro switch pcm038: Add SPI/MC13783 support mx25: Add missing copyright / license header mx25pdk: remove nand support as it is not present in current tree ...
Diffstat (limited to 'drivers/block/virtio_blk.c')
0 files changed, 0 insertions, 0 deletions