summaryrefslogtreecommitdiffstats
path: root/drivers/telephony
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-29 18:33:47 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-29 18:33:47 +0000
commit649e5fb033bbadbfa78aba5e2711f1faf2affaf0 (patch)
tree99c9deb1e7714709bf2a5ccd1d952742dd2a001f /drivers/telephony
parentdf0701bb8660107e811bddba6e4933385f697a21 (diff)
parent39a545559f8d5f13e8a4a7dfddcaad0e2ba9bcfb (diff)
downloadblackbird-op-linux-649e5fb033bbadbfa78aba5e2711f1faf2affaf0.tar.gz
blackbird-op-linux-649e5fb033bbadbfa78aba5e2711f1faf2affaf0.zip
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'drivers/telephony')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud