diff --git a/[refs] b/[refs] index 1ccbf4d2c200..8d17030b4e7c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 432c9ed22aff641039ccd400cdabf983fabc285e +refs/heads/master: fd8b6cb4d820c4a717af1a0ac3ee387fd84571cf diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index f2a2b8e647c5..e2e24b5ba5c3 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -3331,6 +3331,12 @@ F: fs/jbd*/ F: include/linux/ext*jbd*.h F: include/linux/jbd*.h +JSM Neo PCI based serial card +M: Breno Leitao +L: linux-serial@vger.kernel.org +S: Maintained +F: drivers/serial/jsm/ + K8TEMP HARDWARE MONITORING DRIVER M: Rudolf Marek L: lm-sensors@lm-sensors.org