diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-23 10:39:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-23 10:39:36 -0700 |
| commit | 811e42cfba334d27797989ac8b0bea4981cb9581 (patch) | |
| tree | 4641055622b331edd392e31ba32bf05bf9848a3c /drivers/media/common/ir-keymaps.c | |
| parent | 4843a3baf20059a7ac5b55582672705d9e61e274 (diff) | |
| parent | 0d9e6659a1bde3733cfd0072adbb3514b579e383 (diff) | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
libata: don't set IORDY for reset
sata_fsl: Add power mgmt support
[libata] PATA driver for CF interface on AT91SAM9260 SoC
[libata] beautify module parameters
Diffstat (limited to 'drivers/media/common/ir-keymaps.c')
0 files changed, 0 insertions, 0 deletions