summaryrefslogtreecommitdiff
path: root/drivers/acpi/dock.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2010-04-06 17:06:22 -0400
committerLen Brown <len.brown@intel.com>2010-04-06 17:06:22 -0400
commitc25f7cf2032aaac9bd50d6eee982719878538082 (patch)
tree82dfcdae17d29bc0e4ae575d8e009fd479d4bfd7 /drivers/acpi/dock.c
parentf79e1cec8c8aa64895fd7b595dc7b48157df0754 (diff)
parentdadf28a10c3eb29421837a2e413ab869ebd9e168 (diff)
parentac7729da880e742613129ee6dea0045328670d2d (diff)
parent3162b6f0c5e1fcad372d64194fb3cb968941b428 (diff)
parentbc73675b99fd9850dd914be01d71af99c5d2a1ae (diff)
parentb7b30de53aef6ce773d34837ba7d8422bd3baeec (diff)
parentbf02bd2590eb78d79ba1033d6df80c778b2f5ddf (diff)
parent1638bca898e55f1c89f18b2e5accfac8591fed61 (diff)
parent0f9b75ef3722814134f307f51c19e0791da40e69 (diff)
parent17c452f99cf5e073b219a069a419b7b8ab3cfa97 (diff)
Merge branches 'battery', 'bugzilla-14667', 'bugzilla-15096', 'bugzilla-15480', 'bugzilla-15521', 'bugzilla-15605', 'gpe-reference-counters', 'misc', 'pxm-fix' and 'video-random-key' into release