diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-02-15 19:36:30 +0100 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-02-15 19:36:30 +0100 |
commit | 52833e897fd8c6f62b3e5e27291fa9bc803f7460 (patch) | |
tree | cfe90047ee6c7402674a29ec7258319142b96ff1 /arch/sh/drivers/pci/pci-sh5.h | |
parent | NFS: add missing spkm3 strings to mount option parser (diff) | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik... (diff) | |
download | linux-52833e897fd8c6f62b3e5e27291fa9bc803f7460.tar.xz linux-52833e897fd8c6f62b3e5e27291fa9bc803f7460.zip |
Merge branch 'linus_origin' into hotfixes
Diffstat (limited to 'arch/sh/drivers/pci/pci-sh5.h')
0 files changed, 0 insertions, 0 deletions