Merge branches 'acerhdf', 'acpi-pci-bind', 'bjorn-pci-root', 'bugzilla-12904', 'bugzilla-13121', 'bugzilla-13396', 'bugzilla-13533', 'bugzilla-13612', 'c3_lock', 'hid-cleanups', 'misc-2.6.31', 'pdc-leak-fix', 'pnpacpi', 'power_nocheck', 'thinkpad_acpi', 'video' and 'wmi' into release - asmadeus/linux.git

diff options

author	Len Brown <len.brown@intel.com>	2009-06-24 01:19:50 -0400
committer	Len Brown <len.brown@intel.com>	2009-06-24 01:19:50 -0400
commit	fbe8cddd2d85979d273d7937a2b8a47498694d91 (patch)
tree	2ae3253bfd89337583d36afd783145786ffa531e /include/net/ah.h
parent	4e8a2372f9255a1464ef488ed925455f53fbdaa1 (diff)
parent	e86435eb91b2bff114c5a02e46e16ce21b647ebe (diff)
parent	7fe2a6c275a5bcec52fb3ef643daaf8265b7af0d (diff)
parent	0705495d9010048e293013d9d129cf723363a0a8 (diff)
parent	35a7c64fbc77bab4ca8ae477e8ab278ccd679ce2 (diff)
parent	152a4e630f7ffdd7ff64427c4ba488dc0bce76af (diff)
parent	86e437f077c68112edcb6854ec036ed7e3f9a7f3 (diff)
parent	c8d72a5e76988140bfdfd8722f2228d94e7fa10f (diff)
parent	7a04b8491a077471a34938b8ca060c37220953be (diff)
parent	ee1ca48fae7e575d5e399d4fdcfe0afc1212a64c (diff)
parent	9eccbc2f67efd0d19c47f40182abf2965c287add (diff)
parent	7e275cc4e8e20f82740bf40ae2f5695e9e35ff09 (diff)
parent	7b768f07dce463a054c9dd84862d15ccc3d2b712 (diff)
parent	8cb24c8fd70ea8431744de1ca0ca34ab45fbbdaa (diff)
parent	113b3a2b901573961509e81a28e9546cf9defef0 (diff)
parent	d73772474f6ebbacbe820c31c0fa1cffa7160246 (diff)
parent	056c308d3e4859334b519033d62ef050f0e0e261 (diff)
parent	871043bc463e7d191e7b5b00436a8852921dd833 (diff)

Merge branches 'acerhdf', 'acpi-pci-bind', 'bjorn-pci-root', 'bugzilla-12904', 'bugzilla-13121', 'bugzilla-13396', 'bugzilla-13533', 'bugzilla-13612', 'c3_lock', 'hid-cleanups', 'misc-2.6.31', 'pdc-leak-fix', 'pnpacpi', 'power_nocheck', 'thinkpad_acpi', 'video' and 'wmi' into release


context:
space:
mode: