Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
[linux-2.6.git] / arch / parisc / include / asm / fcntl.h
2009-11-17 Stephen Rothwell fcntl: Use consistent values for F_[GS]ETOWN_EX
2009-09-24 Peter Zijlstra fcntl: add F_[SG]ETOWN_EX
2008-10-10 Kyle McMartin parisc: move include/asm-parisc to arch/parisc/include/asm