diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-10-18 12:43:43 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-18 12:43:46 -0400 |
| commit | f2f108eb4511f22a6f7568090cfcf4e7b2dc0f62 (patch) | |
| tree | 4b75771ec02543372808c7df31a1a65e37fdb361 /include/linux/Kbuild | |
| parent | 756b0322e50aebc4b9afb4488a2d3f6c802b4e64 (diff) | |
| parent | 2b666ca4a68cbc22483b0f2e1ba3c0e59b01ae9e (diff) | |
Merge branch 'linus' into core/locking
Merge reason: Update to almost-final-.36
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/Kbuild')
| -rw-r--r-- | include/linux/Kbuild | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index 626b629429ff..4e8ea8c8ec1e 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild | |||
| @@ -118,7 +118,6 @@ header-y += eventpoll.h | |||
| 118 | header-y += ext2_fs.h | 118 | header-y += ext2_fs.h |
| 119 | header-y += fadvise.h | 119 | header-y += fadvise.h |
| 120 | header-y += falloc.h | 120 | header-y += falloc.h |
| 121 | header-y += fanotify.h | ||
| 122 | header-y += fb.h | 121 | header-y += fb.h |
| 123 | header-y += fcntl.h | 122 | header-y += fcntl.h |
| 124 | header-y += fd.h | 123 | header-y += fd.h |