summaryrefslogtreecommitdiff
path: root/CREDITS
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2010-05-03 13:18:00 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2010-05-03 13:18:00 +1000
commit8164fc2482c05740055b8abc142962c5a5d88cf2 (patch)
tree22b6aabf53945a89c3867e695a41b26766f486f3 /CREDITS
parentd981982b47282277aa7cfd8c72b3c7d4424a1a06 (diff)
parentb51d1c6871d1498b90eefc2d43333117982d08ad (diff)
Merge remote branch 'suspend/linux-next'
Diffstat (limited to 'CREDITS')
0 files changed, 0 insertions, 0 deletions