summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c6400
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-10-23 07:35:16 +0900
committerLinus Torvalds <torvalds@linux-foundation.org>2009-10-23 07:35:16 +0900
commit964fe080d94db82a3268443e9b9ece4c60246414 (patch)
treed0095a9befb34f77bf32757e7465e5d2cbc40a93 /arch/arm/mach-s3c6400
parent4848490c50c5d46d4e9749fddc374c303823bcc4 (diff)
parentff07eb897a97640b7ac0262cd50311ad403038f8 (diff)
downloadblackbird-op-linux-964fe080d94db82a3268443e9b9ece4c60246414.tar.gz
blackbird-op-linux-964fe080d94db82a3268443e9b9ece4c60246414.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: move virtrng_remove to .devexit.text move virtballoon_remove to .devexit.text virtio_blk: Revert serial number support virtio: let header files include virtio_ids.h virtio_blk: revert QUEUE_FLAG_VIRT addition
Diffstat (limited to 'arch/arm/mach-s3c6400')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud