diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-17 05:58:37 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-17 05:58:37 +0400 |
commit | c970d5a32ae1a90fba89892cc3432cf0b408cb8b (patch) | |
tree | 1d8c3b5bf21249057efabfbb19abd63960a23a1d /fs/ocfs2/slot_map.h | |
parent | 6af74b03e00fc78806f75f6701b24b582bbb5c96 (diff) | |
parent | da19566552315389370c40e690054a31b7623de5 (diff) | |
download | linux-c970d5a32ae1a90fba89892cc3432cf0b408cb8b.tar.xz |
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:
it821x: do not describe noraid parameter with its value
Pb1200/DBAu1200: fix bad IDE resource size
Au1200: IDE driver build fix
Au1200: kill IDE driver function prototypes
avr32 mustn't select HAVE_IDE
Diffstat (limited to 'fs/ocfs2/slot_map.h')
0 files changed, 0 insertions, 0 deletions