diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-08 10:13:28 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-08 10:13:28 -0700 |
commit | ba933beb11b46b6d90d53b7220858148d8687ab1 (patch) | |
tree | 57ee9e36973d8cc560eedcc0e5ff10b63bd0c69b /include/linux/ioctl.h | |
parent | 81d1ab82c045fd4d2f3c803147f0a1c6bd2015fc (diff) | |
parent | c63c58056e268b0d6bd6994b69030c144567990d (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 PCI DMA flag propagation on SN (Altix) with PICs
Diffstat (limited to 'include/linux/ioctl.h')
0 files changed, 0 insertions, 0 deletions