diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-16 02:34:20 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-16 02:34:20 +0200 |
commit | e2e96c663639a3361bb1a84e666887d308c6c87e (patch) | |
tree | 7c28b1e5baaff4741d974193ba30f1c53992596f /block/ioctl.c | |
parent | Merge git://git.infradead.org/mtd-2.6 (diff) | |
parent | intel-iommu: Fix 32-bit build warning with __cmpxchg() (diff) | |
download | linux-e2e96c663639a3361bb1a84e666887d308c6c87e.tar.xz linux-e2e96c663639a3361bb1a84e666887d308c6c87e.zip |
Merge git://git.infradead.org/iommu-2.6
* git://git.infradead.org/iommu-2.6:
intel-iommu: Fix 32-bit build warning with __cmpxchg()
intr-remap: allow disabling source id checking
Diffstat (limited to 'block/ioctl.c')
0 files changed, 0 insertions, 0 deletions