summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile/clock.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-04-14 03:45:13 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2012-04-14 03:45:13 +0200
commitc104f1fa1ecf4ee0fc06e31b1f77630b2551be81 (patch)
tree31c9e009409cc0b26b6d69adf48d49b08aded978 /arch/arm/mach-shmobile/clock.c
parentMerge branch 'for-3.4/core' of git://git.kernel.dk/linux-block (diff)
parentblock: mtip32xx: remove HOTPLUG_PCI_PCIE dependancy (diff)
downloadlinux-c104f1fa1ecf4ee0fc06e31b1f77630b2551be81.tar.xz
linux-c104f1fa1ecf4ee0fc06e31b1f77630b2551be81.zip
Merge branch 'for-3.4/drivers' of git://git.kernel.dk/linux-block
Pull block driver bits from Jens Axboe: - A series of fixes for mtip32xx. Most from Asai at Micron, but also one from Greg, getting rid of the dependency on PCIE_HOTPLUG. - A few bug fixes for xen-blkfront, and blkback. - A virtio-blk fix for Vivek, making resize actually work. - Two fixes from Stephen, making larger transfers possible on cciss. This is needed for tape drive support. * 'for-3.4/drivers' of git://git.kernel.dk/linux-block: block: mtip32xx: remove HOTPLUG_PCI_PCIE dependancy mtip32xx: dump tagmap on failure mtip32xx: fix handling of commands in various scenarios mtip32xx: Shorten macro names mtip32xx: misc changes mtip32xx: Add new sysfs entry 'status' mtip32xx: make setting comp_time as common mtip32xx: Add new bitwise flag 'dd_flag' mtip32xx: fix error handling in mtip_init() virtio-blk: Call revalidate_disk() upon online disk resize xen/blkback: Make optional features be really optional. xen/blkback: Squash the discard support for 'file' and 'phy' type. mtip32xx: fix incorrect value set for drv_cleanup_done, and re-initialize and start port in mtip_restart_port() cciss: Fix scsi tape io with more than 255 scatter gather elements cciss: Initialize scsi host max_sectors for tape drive support xen-blkfront: make blkif_io_lock spinlock per-device xen/blkfront: don't put bdev right after getting it xen-blkfront: use bitmap_set() and bitmap_clear() xen/blkback: Enable blkback on HVM guests xen/blkback: use grant-table.c hypercall wrappers
Diffstat (limited to 'arch/arm/mach-shmobile/clock.c')
0 files changed, 0 insertions, 0 deletions