diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-22 10:03:51 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-22 10:03:51 -0700 |
commit | 7b1f513aacee53ed2d20cdf82191c7f486136469 (patch) | |
tree | eecd228c44fec22c19d7368c48094df722727bbf /drivers/acpi/dock.c | |
parent | 258152acc09c5c2df97002cd58cb37cb241aacde (diff) | |
parent | 2de16a493cc6153f7fa0b9da12a3862d063e3425 (diff) | |
download | kernel-common-7b1f513aacee53ed2d20cdf82191c7f486136469.tar.gz kernel-common-7b1f513aacee53ed2d20cdf82191c7f486136469.tar.bz2 kernel-common-7b1f513aacee53ed2d20cdf82191c7f486136469.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
virtio: console: Check if port is valid in resize_console
virtio: console: Generate a kobject CHANGE event on adding 'name' attribute
Diffstat (limited to 'drivers/acpi/dock.c')
0 files changed, 0 insertions, 0 deletions