diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-27 17:46:47 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-27 17:46:47 -0700 |
commit | 9dda696f0de87a2e5cfabb147e28c76b7d3c6846 (patch) | |
tree | 862a9fa39ce2d33156b815e1f7352038287579bf /drivers/parport | |
parent | c5617b200ac52e35f7e8cf05a17b0a2d50f6b3e9 (diff) | |
parent | 4ec37de89d8c758ee8115e0e64b3f994910789ee (diff) |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Fix build breakage
Diffstat (limited to 'drivers/parport')
0 files changed, 0 insertions, 0 deletions