summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/sfc/efx.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-11-24 17:32:59 +0900
committerPaul Mundt <lethal@linux-sh.org>2011-11-24 17:32:59 +0900
commitbe09d1dcf21eb3121bed3ee4dadacdea1805d7f8 (patch)
tree5268aaba99aee3a03263bd7c24dfd174cafeb332 /drivers/net/ethernet/sfc/efx.c
parent9bcc0a5d0de137b3a154dc951c5ff70dce815879 (diff)
parent33661c9e2062865acde9d421c971f1c142cf99ca (diff)
parenteded9143151a116753b1d8e893bc2d37f8687e0b (diff)
Merge branches 'rmobile/core', 'rmobile/kota2' and 'rmobile/ag5' into rmobile-fixes-for-linus