summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-06-27 16:30:25 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-06-27 16:30:25 +0200
commit24eb90abdd54446da5afe71f7c264fe26cfc5659 (patch)
tree75bbb9cc5fc4e6690fd59e404900595132df5cb5 /usr
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mat... (diff)
parentpowerpc/5200: fix lite5200 ethernet phy address (diff)
downloadlinux-24eb90abdd54446da5afe71f7c264fe26cfc5659.tar.xz
linux-24eb90abdd54446da5afe71f7c264fe26cfc5659.zip
Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6
* 'merge' of git://git.secretlab.ca/git/linux-2.6: powerpc/5200: fix lite5200 ethernet phy address powerpc/5200: Fix build error in sound code. powerpc/5200: fix oops during going to standby powerpc/5200: add lite5200 onboard I2C eeprom and flash maintainers: Add git trees for SPI and device tree of: Drop properties with "/" in their name
Diffstat (limited to 'usr')
0 files changed, 0 insertions, 0 deletions