diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-08-31 04:25:26 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-08-31 04:25:26 -0400 |
| commit | 02b643b643254ec79b5f9aaa143e10be68eabdab (patch) | |
| tree | 57ec83eebab74324465199a3f52f4f7862177ee6 | |
| parent | d1ee8bc195ffedbf91af0245a2406d6ebd2578f8 (diff) | |
| parent | 4c09e0d6ba65507a0ee0ca9abc5335e4f7bd7404 (diff) | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
124 files changed, 855 insertions, 1087 deletions
diff --git a/.get_maintainer.ignore b/.get_maintainer.ignore new file mode 100644 index 000000000000..cca6d870f7a5 --- /dev/null +++ b/.get_maintainer.ignore | |||
| @@ -0,0 +1 @@ | |||
| Christoph Hellwig <hch@lst.de> | |||
diff --git a/MAINTAINERS b/MAINTAINERS index 569568f6644f..b60e2b2369d2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -5849,6 +5849,7 @@ S: Odd Fixes | |||
| 5849 | 5849 | ||
| 5850 | KERNEL NFSD, SUNRPC, AND LOCKD SERVERS | 5850 | KERNEL NFSD, SUNRPC, AND LOCKD SERVERS |
| 5851 | M: "J. Bruce Fields" <bfields@fieldses.org> | 5851 | M: "J. Bruce Fields" <bfields@fieldses.org> |
| 5852 | M: Jeff Layton <jlayton@poochiereds.net> | ||
| 5852 | L: linux-nfs@vger.kernel.org | 5853 | L: linux-nfs@vger.kernel.org |
| 5853 | W: http://nfs.sourceforge.net/ | 5854 | W: http://nfs.sourceforge.net/ |
| 5854 | S: Supported | 5855 | S: Supported |
diff --git a/Makefile b/Makefile index 6e88c371b32f | |||