diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-22 19:22:56 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-22 19:22:56 -0700 |
commit | 5f48b338cd28f4095697a174d7e3e72084aca893 (patch) | |
tree | 3e425801e8da2ffdfd6a88c3f494032bc512a5fa /drivers/media/video/cpia.c | |
parent | f09cc910fe3af7e63298105bc0482653eb534c3c (diff) | |
parent | 29f139ce27c7e64a3e8575afa8deb46cde09db0a (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]: ARRAY_SIZE() cleanup
[SPARC64]: small Makefile cleanups
[SPARC64]: Stop using __do_IRQ().
[SPARC64]: Update defconfig.
Diffstat (limited to 'drivers/media/video/cpia.c')
0 files changed, 0 insertions, 0 deletions