aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds2009-08-18 13:54:26 -0700
committerLinus Torvalds2009-08-18 13:54:26 -0700
commitb9d030a123b6b7fbf262c995455197ea5184b497 (patch)
tree9e98829c9c79b4085c762fe6fa00c6bb6f49e8f6 /net
parent435a71d9ef68b03343949c814986e01dae849763 (diff)
parent237674e050ae8ea40a432412df6c15d60b7ae8a6 (diff)
Merge branch 'sh/for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh/for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: sh: sh7724 ddr self-refresh changes sh: use in-soc KEYSC on se7724 sh: CMT suspend/resume sh: skip disabled LCDC channels
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions