diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-02 19:22:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-02 19:22:54 -0700 |
| commit | a16b4bcd31a73a81b6d2b8ffa6b5f6ed01cf6d64 (patch) | |
| tree | 870f95ae22f423e60f4518fd38ab8e0649769991 /drivers/media/video/Makefile | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| parent | ide: fix /proc/ide/ide?/mate reporting (diff) | |
| download | linux-dev-a16b4bcd31a73a81b6d2b8ffa6b5f6ed01cf6d64.tar.xz linux-dev-a16b4bcd31a73a81b6d2b8ffa6b5f6ed01cf6d64.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
ide: fix /proc/ide/ide?/mate reporting
Revert "BAST: Remove old IDE driver"
Diffstat (limited to 'drivers/media/video/Makefile')
0 files changed, 0 insertions, 0 deletions