From: Len Brown <len.brown@intel.com>
Date: Wed, 24 Jun 2009 05:22:20 +0000 (-0400)
Subject: Merge branch 'bjorn-notify' into release
X-Git-Tag: v2.6.31-rc1~12^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57599cc997b81a7c4f764693a7316886a72067fe;p=pandora-kernel.git

Merge branch 'bjorn-notify' into release

Conflicts:
	drivers/platform/x86/eeepc-laptop.c

Signed-off-by: Len Brown <len.brown@intel.com>
---

57599cc997b81a7c4f764693a7316886a72067fe
Reading git-diff-tree failed