diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-11-04 01:49:35 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-11-04 01:49:35 -0500 |
| commit | 2a3ede8cb2ddee5885518e4232aca13056f9a6e0 (patch) | |
| tree | 79b2b4e060a97b1e7c60d58549f8c97cb15db5dd | |
| parent | 0e73453e172aaa38fd59fd4d3fc589e8fc9b9a70 (diff) | |
| parent | 215432ed30393ed4a8f77db0a1fe34523c48cdba (diff) | |
Merge branch 'perf/urgent' into perf/core to fix conflicts
Conflicts:
tools/perf/bench/numa.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
83 files changed, 729 insertions, 681 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3438384d270c..ffcaf975bed7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -8917,61 +8917,14 @@ W: http://pegasus2.sourceforge.net/ | |||
| 8917 | S: Maintained | 8917 | S: Maintained |
| 8918 | F: drivers/net/usb/rtl8150.c | 8918 | F: drivers/net/usb/rtl8150.c |
| 8919 | 8919 | ||
| 8920 | USB SERIAL BELKIN F5U103 DRIVER | 8920 | USB SERIAL SUBSYSTEM |
| 8921 | M: William Greathouse <wgreathouse@smva.com> | 8921 | M: Johan Hovold <jhovold@gmail.com> |
| 8922 | L: linux-usb@vger.kernel.org | 8922 | L: linux-usb@vger.kernel.org |
| 8923 | S: Maintained | 8923 | S: Maintained |
| 8924 | F: drivers/usb/serial/belkin_sa.* | ||
| 8925 | |||
| 8926 | USB SERIAL CYPRESS M8 DRIVER | ||
| 8927 | M: Lonnie Mendez <dignome@gmail.com> | ||
| 8928 | L: linux-usb@vger.kernel.org | ||
| 8929 | S: Maintained | ||
| 8930 | W: http://geocities.com/i0xox0i | ||
| 8931 | W: http://firstlight.net/cvs | ||
| 8932 | F: drivers/usb/serial/cypress_m8.* | ||
| 8933 | |||
| 8934 | USB SERIAL CYBERJACK DRIVER | ||
| 8935 | M: Matthias Bruestle and Harald Welte <support@reiner-sct.com> | ||
| 8936 | W: http://www.reiner-sct.de/support/treiber_cyberjack.php | ||
| 8937 | S: Maintained | ||
| 8938 | F: drivers/usb/serial/cyberjack.c | ||
| 8939 | |||
| 8940 | USB SERIAL DIGI ACCELEPORT DRIVER | ||
| 8941 | M: Peter Berger <pberger@brimson.com> | ||
| 8942 | M: Al Borchers <alborchers@steinerpoint.com> | ||
| 8943 | L: linux-usb@vger.kernel.org | ||
| 8944 | S: Maintained | ||
| 8945 | F: drivers/usb/serial/digi_acceleport.c | ||
| 8946 | |||
| 8947 | USB SERIAL DRIVER | ||
| 8948 | M: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | ||
| 8949 | L: linux-usb@vger.kernel.org | ||
| 8950 | S: Supported | ||
| 8951 | F: Documentation/usb/usb-serial.txt | 8924 | F: Documentation/usb/usb-serial.txt |
| 8952 | F: drivers/usb/serial/generic.c | 8925 | F: drivers/usb/serial/ |
| 8953 | F: drivers/usb/serial/usb-serial.c | ||
| 8954 | F: include/linux/usb/serial.h | 8926 | F: include/linux/usb/serial.h |
| 8955 | 8927 | ||
| 8956 | USB SERIAL EMPEG EMPEG-CAR MARK I/II DRIVER | ||
| 8957 | M: Gary Brubaker <xavyer@ix.netcom.com> | ||
| 8958 | L: linux-usb@vger.kernel.org | ||
| 8959 | S: Maintained | ||
| 8960 | F: drivers/usb/serial/empeg.c | ||
| 8961 | |||
| 8962 | USB SERIAL KEYSPAN DRIVER | ||
| 8963 | M: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | ||
| 8964 | L: linux-usb@vger.kernel.org | ||
| 8965 | S: Maintained | ||
| 8966 | F: drivers/usb/serial/*keyspan* | ||
| 8967 | |||
| 8968 | USB SERIAL WHITEHEAT DRIVER | ||
| 8969 | M: Support Department <support@connecttech.com> | ||
| 8970 | L: linux-usb@vger.kernel.org | ||
| 8971 | W: http://www.connecttech.com | ||
| 8972 | S: Supported | ||
| 8973 | F: drivers/usb/serial/whiteheat* | ||
| 8974 | |||
| 8975 | USB SMSC75XX ETHERNET DRIVER | 8928 | USB SMSC75XX ETHERNET DRIVER |