aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/pci
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-30 18:40:35 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-30 18:40:35 -0400
commit9262e9149f346a5443300f8c451b8e7631e81a42 (patch)
treef21b2d6f9270c7d0ff807f070e38d0f665582f21 /drivers/ide/pci
parente37a72de84d27ee8bc0e7dbb5c2f1774ed306dbb (diff)
parent6e990b50ed0b45d506ff6809034508d3e210497d (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Kill sun4v virtual device layer. [SERIAL] sunhv: Convert to of_driver layer. [SPARC64]: Mask out top 8-bits in physical address when building resources. [SERIAL] sunsu: Missing return statement in su_probe().
Diffstat (limited to 'drivers/ide/pci')
0 files changed, 0 insertions, 0 deletions