Learn more about cloning repositories
You have read-only access
Merge branch 'master' of /home/cbou/linux-2.6 Conflicts: drivers/power/Kconfig drivers/power/Makefile