diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-04 13:25:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-04 13:25:59 -0700 |
| commit | 4acbab84688bfea82322c14e809fc7d82242cee3 (patch) | |
| tree | 7c4a9c0a088a70799d744d30e7c6a3220701adbb /init | |
| parent | 78ae87c3cd723c8a8dcd67d4e4cbc6d63671c108 (diff) | |
| parent | 899b69d079713d0f568fb2700b86987aa94f29b2 (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:
[ATA]: Don't allow to enable this for SPARC64 without PCI.
[VIDEO]: XVR500 and XVR2500 require FB=y
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions