diff --git a/[refs] b/[refs] index f6481c5c63bf..244acba648e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 33cfe65a786cf3d048688b932f41df937282a7bb +refs/heads/master: 9acf70c1aa1b5a0f8a6a0815c0bc5de2a45e0d71 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 6d119c98b89b..1b277665e634 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -5317,6 +5317,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git S: Maintained F: arch/sparc/ +F: drivers/sbus SPARC SERIAL DRIVERS M: "David S. Miller"