summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-03-26 11:03:03 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-03-26 11:03:03 +0100
commit938c0ace3ffb8cc2073a6d2e68fa7a6ab7cb471e (patch)
tree9257bdba52ce88ca0a0c2f6fce1f59a1eb278452 /usr
parentMerge branch 'syscore' of git://git.kernel.org/pub/scm/linux/kernel/git/rafae... (diff)
parentARM: pxa/am300epd: fix leak in am300_init_gpio_regs error path (diff)
downloadlinux-938c0ace3ffb8cc2073a6d2e68fa7a6ab7cb471e.tar.xz
linux-938c0ace3ffb8cc2073a6d2e68fa7a6ab7cb471e.zip
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
Conflicts: arch/arm/mach-pxa/tosa.c
Diffstat (limited to 'usr')
0 files changed, 0 insertions, 0 deletions