diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-08 18:15:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-08 18:15:23 -0700 |
| commit | 7ac7834765e1c888ab06f677d906179858627f26 (patch) | |
| tree | b08e3a4c652fac9e300dcfa3b6fbe094c6c9a77a /net/irda | |
| parent | 5b65c09e9966cae543d4727984f098b699aa1653 (diff) | |
| parent | 8c2786cfa6d15c474ec7030e8161c88e9b5c597d (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Handle PCI bridges without 'ranges' property.
[SPARC64]: Include <linux/rwsem.h> instead of <asm/rwsem.h>.
Diffstat (limited to 'net/irda')
0 files changed, 0 insertions, 0 deletions