diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-10 09:31:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-10 09:31:19 -0700 |
| commit | a651d7997978bdecfc9891b05b9ee3dccb42f588 (patch) | |
| tree | e56ec2555639d5354dab6847c336dcb488cdc75a /drivers/ide/cy82c693.c | |
| parent | bad948ffee7cbf73a7dd3e4b8272985d5c3c8b55 (diff) | |
| parent | 467fc4988986865b5dbcc8cc6a86c9b650cb0c6f (diff) | |
Merge branch 'sh/for-2.6.29' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh/for-2.6.29' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
video: deferred io cleanup fix for sh_mobile_lcdcfb
sh: Add media/soc_camera.h to board setup of Renesas AP325RXA
Diffstat (limited to 'drivers/ide/cy82c693.c')
0 files changed, 0 insertions, 0 deletions