| commit | 3308ee8f4582f97d1c08864dd06f7291aea323e5 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jan 29 18:07:15 2014 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jan 29 18:07:15 2014 -0800 |
| tree | aa58ea6357b174633706e75aa94ddf4d882a7824 | |
| parent | 13293115d1c44df1077976473112d18f1877c390 [diff] | |
| parent | 61eae5bb06496a6633ba000a1d7546b494e00081 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide Pull IDE fixes from David Miller: "Two header file inclusion fixes from Rashika Kheria" * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide: drivers: ide: Include appropriate header file in ide-pio-blacklist.c drivers: ide: Include appropriate header file in ide-cd_verbose.c