summaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-21 00:39:23 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-21 00:39:23 (GMT)
commitfc887b15d935ead2a00aef5779a18034e7c69ee1 (patch)
tree30daa1c9bafbf179047047c67d11ccd98e27d809 /drivers/acpi
parent466c19063b4b426d5c362572787cb249fbf4296b (diff)
parentdf6212529c646710502657b18d8f42927f3dda81 (diff)
downloadlinux-fc887b15d935ead2a00aef5779a18034e7c69ee1.tar.xz
Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
* 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: tty: update MAINTAINERS file due to driver movement tty: move drivers/serial/ to drivers/tty/serial/ tty: move hvc drivers to drivers/tty/hvc/
Diffstat (limited to 'drivers/acpi')
0 files changed, 0 insertions, 0 deletions