summaryrefslogtreecommitdiff
path: root/block/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-04 18:45:35 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-04 18:45:35 (GMT)
commit3c06806e690885ce978ef180c8f8b6f8c17fb4b4 (patch)
treead81aba3744848d97df016f21e63390ab6fe0752 /block/Makefile
parentd9f73afcd364eb02b355921f6101db9e7ee4001c (diff)
parentfa32154e47a203688453e53c1369fcbc63b06a21 (diff)
downloadlinux-fsl-qoriq-3c06806e690885ce978ef180c8f8b6f8c17fb4b4.tar.xz
Merge branch 'merge-powerpc' of git://git.secretlab.ca/git/linux-2.6
* 'merge-powerpc' of git://git.secretlab.ca/git/linux-2.6: powerpc/5200: tighten up ac97 reset timing powerpc/5200: efika.c: Add of_node_put to avoid memory leak powerpc/512x: fix clk_get() return value
Diffstat (limited to 'block/Makefile')
0 files changed, 0 insertions, 0 deletions