Merge branch 'bjorn-notify' into release
authorLen Brown <len.brown@intel.com>
Wed, 24 Jun 2009 05:22:20 +0000 (01:22 -0400)
committerLen Brown <len.brown@intel.com>
Wed, 24 Jun 2009 05:22:20 +0000 (01:22 -0400)
Conflicts:
drivers/platform/x86/eeepc-laptop.c

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

Trivial merge