aboutsummaryrefslogtreecommitdiff
path: root/drivers/dma/fsldma.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-04-16 18:34:12 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-04-16 18:34:12 -0700
commitcdd5983063cadf40db63117f4a299881b3bb71c1 (patch)
tree3acf64aaeeceb1e2e3b50749356c3cd05348e1a9 /drivers/dma/fsldma.c
parenta6cb9ee7cabe68002c3f2ab07224ea27d2617cf1 (diff)
parent3ccc9372ed0fab33d20f10be3c1efd5776ff5913 (diff)
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio fixes from Michael S. Tsirkin: "Here are some virtio fixes for 3.4: a test build fix, a patch by Ren fixing naming for systems with a massive number of virtio blk devices, and balloon fixes for powerpc by David Gibson. There was some discussion about Ren's patch for virtio disc naming: some people wanted to move the legacy name mangling function to the block core. But there's no concensus on that yet, and we can always deduplicate later. Added comments in the hope that this will stop people from copying this legacy naming scheme into future drivers." * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: virtio_balloon: fix handling of PAGE_SIZE != 4k virtio_balloon: Fix endian bug virtio_blk: helper function to format disk names tools/virtio: fix up vhost/test module build
Diffstat (limited to 'drivers/dma/fsldma.c')
0 files changed, 0 insertions, 0 deletions