diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-02 06:30:42 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-02 06:30:42 +0100 |
commit | dc512814b5f8b7b80c74d6170b93a606ae4f36c5 (patch) | |
tree | 9c2af6d5f2a5cb628f80a037061d5a73d15e98ec /drivers/scsi/scsi_sysfs.c | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86 (diff) | |
parent | [POWERPC] Fix build failure on Cell when CONFIG_SPU_FS=y (diff) | |
download | linux-dc512814b5f8b7b80c74d6170b93a606ae4f36c5.tar.xz linux-dc512814b5f8b7b80c74d6170b93a606ae4f36c5.zip |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Fix build failure on Cell when CONFIG_SPU_FS=y
Diffstat (limited to 'drivers/scsi/scsi_sysfs.c')
0 files changed, 0 insertions, 0 deletions