aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-04 11:45:35 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-04 11:45:35 -0700
commit3c06806e690885ce978ef180c8f8b6f8c17fb4b4 (patch)
treead81aba3744848d97df016f21e63390ab6fe0752 /kernel
parentMerge branch 'fix/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 (diff)
parentpowerpc/5200: tighten up ac97 reset timing (diff)
downloadlinux-dev-3c06806e690885ce978ef180c8f8b6f8c17fb4b4.tar.xz
linux-dev-3c06806e690885ce978ef180c8f8b6f8c17fb4b4.zip
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 'kernel')
0 files changed, 0 insertions, 0 deletions