diff options
author | Jiri Kosina <jkosina@suse.cz> | 2011-06-10 14:46:48 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2011-06-10 14:46:57 +0200 |
commit | 5be5758c114b18260c6fd4c8373bf89e39b0fe82 (patch) | |
tree | 54390f904df6ff11e570f764c444356cf2709fda /arch/mips/pci | |
parent | doc: i2o: fix typo 'Settting' (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
download | linux-5be5758c114b18260c6fd4c8373bf89e39b0fe82.tar.xz linux-5be5758c114b18260c6fd4c8373bf89e39b0fe82.zip |
Merge branch 'master' into for-next
Sync with Linus' tree to be able to apply patches against new
code I have in queue.
Diffstat (limited to 'arch/mips/pci')
0 files changed, 0 insertions, 0 deletions