summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/control.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-02 10:33:36 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-02 10:33:36 -0800
commit6c0ad5dfd3d5ad6def89b485ee52834547da239b (patch)
tree65ae78589671998bc4e8ed6a88a0a9205fbde296 /arch/arm/mach-omap2/control.c
parentb7f3a209e9b09b3110ea084836c75f2cd26b29f2 (diff)
parent9599945bac93b344519ea97f502cf537124b5a6e (diff)
downloadblackbird-op-linux-6c0ad5dfd3d5ad6def89b485ee52834547da239b.tar.gz
blackbird-op-linux-6c0ad5dfd3d5ad6def89b485ee52834547da239b.zip
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block: Revert "blkdev: fix merge_bvec_fn return value checks"
Diffstat (limited to 'arch/arm/mach-omap2/control.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud