diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-28 19:51:01 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-28 19:51:01 +0200 |
commit | 571503e10045c89af951962ea0bb783482663aad (patch) | |
tree | b24af1e4b5c67e2da940991b8219f8f8c4e7ac0a /drivers/ata/pata_legacy.c | |
parent | Merge git://git.infradead.org/mtd-2.6 (diff) | |
parent | ns: Wire up the setns system call (diff) | |
download | linux-571503e10045c89af951962ea0bb783482663aad.tar.xz linux-571503e10045c89af951962ea0bb783482663aad.zip |
Merge branch 'setns'
* setns:
ns: Wire up the setns system call
Done as a merge to make it easier to fix up conflicts in arm due to
addition of sendmmsg system call
Diffstat (limited to 'drivers/ata/pata_legacy.c')
0 files changed, 0 insertions, 0 deletions