diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-18 17:21:03 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-18 17:21:03 +1000 |
| commit | 8e7b4e6162da24c2be46c7e25c2e0406b0f8c1a9 (patch) | |
| tree | 17caf98d551e2f92f764dcbc5b86dffa31e5ecdc /include/linux/fadvise.h | |
| parent | 484fcd2d3762eec7b0ba5ff1031c0d4e5ef23345 (diff) | |
| parent | d4aaf522cb2cdc3f5401a808e068c022d019bd7d (diff) | |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/epl/VirtualEthernetLinux.c
Diffstat (limited to 'include/linux/fadvise.h')
0 files changed, 0 insertions, 0 deletions