aboutsummaryrefslogtreecommitdiff
path: root/drivers/spi/spi_butterfly.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-10 11:11:47 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-10 11:11:47 -0700
commitb0af205afb111e17ac8db64c3b9c4f2c332de92a (patch)
tree3999a2ffbd36e9d1cc6ca30e6b9d6280f4e50116 /drivers/spi/spi_butterfly.c
parent73f6aa4d44ab6157badc456ddfa05b31e58de5f0 (diff)
parent0c2322e4ce144e130c03d813fe92de3798662c5e (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm
* git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm: dm: detect lost queue dm: publish dm_vcalloc dm: publish dm_table_unplug_all dm: publish dm_get_mapinfo dm: export struct dm_dev dm crypt: avoid unnecessary wait when splitting bio dm crypt: tidy ctx pending dm crypt: fix async inc_pending dm crypt: move dec_pending on error into write_io_submit dm crypt: remove inc_pending from write_io_submit dm crypt: tidy write loop pending dm crypt: tidy crypt alloc dm crypt: tidy inc pending dm exception store: use chunk_t for_areas dm exception store: introduce area_location function dm raid1: kcopyd should stop on error if errors handled dm mpath: remove is_active from struct dm_path dm mpath: use more error codes Fixed up trivial conflict in drivers/md/dm-mpath.c manually.
Diffstat (limited to 'drivers/spi/spi_butterfly.c')
0 files changed, 0 insertions, 0 deletions