commit | 57599cc997b81a7c4f764693a7316886a72067fe | [log] [tgz] |
---|---|---|
author | Len Brown <len.brown@intel.com> | Wed Jun 24 01:22:20 2009 -0400 |
committer | Len Brown <len.brown@intel.com> | Wed Jun 24 01:22:20 2009 -0400 |
tree | 2e5cd27682614c88ec72009f9605062ada6eae25 | |
parent | fbe8cddd2d85979d273d7937a2b8a47498694d91 [diff] | |
parent | 586caae36cece718ff46b3a59b88af79e9f7a2e0 [diff] |
Merge branch 'bjorn-notify' into release Conflicts: drivers/platform/x86/eeepc-laptop.c Signed-off-by: Len Brown <len.brown@intel.com>