From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 27 Jun 2010 14:30:25 +0000 (-0700)
Subject: Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=24eb90abdd54446da5afe71f7c264fe26cfc5659;p=openwrt%2Fstaging%2Fblogic.git

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
---

24eb90abdd54446da5afe71f7c264fe26cfc5659