]> err.no Git - linux-2.6/commitdiff
Merge branch 'wmi-fix' into release-2.6.27
authorAndi Kleen <ak@linux.intel.com>
Thu, 4 Sep 2008 12:41:02 +0000 (14:41 +0200)
committerAndi Kleen <ak@linux.intel.com>
Thu, 4 Sep 2008 12:41:02 +0000 (14:41 +0200)
1  2 
drivers/misc/acer-wmi.c

Simple merge