diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-11-25 17:23:57 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-11-25 17:23:57 -0500 |
| commit | 2a859ab07b6ab66f4134c4fffc341398bd3d328c (patch) | |
| tree | c5e7eaf3bffbc18feb326940e39794328d98dc07 /include/linux/raid/Kbuild | |
| parent | cedddd812a79a4fda3885a15711aee3de78c4a24 (diff) | |
| parent | e716e014384688d1a50d1aa5213ee74748c6d4e0 (diff) | |
Merge branch 'merge' into next
Merge my own merge branch to get various fixes from there
and upstream, especially the hvc console tty refcouting fixes
which which testing is quite a bit harder...
Diffstat (limited to 'include/linux/raid/Kbuild')
| -rw-r--r-- | include/linux/raid/Kbuild | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/raid/Kbuild b/include/linux/raid/Kbuild index 2415a64c5e51..e69de29bb2d1 100644 --- a/include/linux/raid/Kbuild +++ b/include/linux/raid/Kbuild | |||
| @@ -1,2 +0,0 @@ | |||
| 1 | header-y += md_p.h | ||
| 2 | header-y += md_u.h | ||