aboutsummaryrefslogtreecommitdiffstats
path: root/arch/alpha/kernel/pci-sysfs.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-06-27 10:30:25 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-06-27 10:30:25 -0400
commit24eb90abdd54446da5afe71f7c264fe26cfc5659 (patch)
tree75bbb9cc5fc4e6690fd59e404900595132df5cb5 /arch/alpha/kernel/pci-sysfs.c
parentddc39f90a956b1ce49213e057d32fc94253e20f6 (diff)
parent2b07be2493681220cac4d185494a4edb0b8efd1e (diff)
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 'arch/alpha/kernel/pci-sysfs.c')
0 files changed, 0 insertions, 0 deletions