Merge by hand (conflicts between pending drivers and kfree cleanups)
[linux-2.6] / include / asm-s390 / fcntl.h
1 #include <asm-generic/fcntl.h>