summaryrefslogtreecommitdiffstats
path: root/drivers/platform/x86/Makefile
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-06-24 01:22:20 -0400
committerLen Brown <len.brown@intel.com>2009-06-24 01:22:20 -0400
commit57599cc997b81a7c4f764693a7316886a72067fe (patch)
tree2e5cd27682614c88ec72009f9605062ada6eae25 /drivers/platform/x86/Makefile
parentfbe8cddd2d85979d273d7937a2b8a47498694d91 (diff)
parent586caae36cece718ff46b3a59b88af79e9f7a2e0 (diff)
downloadblackbird-op-linux-57599cc997b81a7c4f764693a7316886a72067fe.tar.gz
blackbird-op-linux-57599cc997b81a7c4f764693a7316886a72067fe.zip
Merge branch 'bjorn-notify' into release
Conflicts: drivers/platform/x86/eeepc-laptop.c Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/platform/x86/Makefile')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud