]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Jan 2010 17:32:50 +0000 (09:32 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Jan 2010 17:32:50 +0000 (09:32 -0800)
commit03ffa7b859ad5d41639e09ed3087044a5f526028
tree551d8ad66a564a1ec2552168b9cf1b08d1ebc6c3
parent6e50bf2d0375dd8a16af37b0f0dca56f665cbed6
parentfd63579f6ab7a1cc27a109b44f24dc62a5361ab0
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  hp-wmi: remove double free caused by merge conflict