aboutsummaryrefslogtreecommitdiff
path: root/arch/cris
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2009-09-02 15:23:05 -0700
committerTony Lindgren <tony@atomide.com>2009-09-02 15:23:05 -0700
commit5567fa1f543dde3c42f8e52bf4f7005135b24896 (patch)
treef4e2815758d5dd15f75a6c1523c1abc50966cdcb /arch/cris
parentd3d381c6365ef5b06c4184a3fe047cf027533970 (diff)
parent68d4778c701b7e22ddfd64e3afb6628c92718ad2 (diff)
Merge branch 'pm-upstream/debug' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into for-next
Diffstat (limited to 'arch/cris')
0 files changed, 0 insertions, 0 deletions