]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 081a9d0 382414b)
Merge branch 'pm-domains' into pm-for-linus
authorRafael J. Wysocki <rjw@sisk.pl>
Fri, 21 Oct 2011 22:21:52 +0000 (00:21 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Fri, 21 Oct 2011 22:21:52 +0000 (00:21 +0200)
* pm-domains:
  ARM: mach-shmobile: sh7372 A4R support (v4)
  ARM: mach-shmobile: sh7372 A3SP support (v4)
  PM / Sleep: Mark devices involved in wakeup signaling during suspend

1  2 
drivers/base/power/main.c patch | diff1 | diff2 | blob | history
include/linux/pm.h patch | diff1 | diff2 | blob | history

diff --cc drivers/base/power/main.c
Simple merge
diff --cc include/linux/pm.h
Simple merge
Linux kernel for KaRo TX COM modules