| commit | edb15d83a875a1f4b1576188844db5c330c3267d | [log] [tgz] |
|---|---|---|
| author | Ralf Baechle <ralf@linux-mips.org> | Thu Feb 21 16:16:55 2013 +0100 |
| committer | Ralf Baechle <ralf@linux-mips.org> | Fri Feb 22 10:07:30 2013 +0100 |
| tree | 74d54eab401b6ccf2a6ad4821227108a8d160f03 | |
| parent | 8bfc245f9ad7bd4e461179e4e7852ef99b8b6144 [diff] | |
| parent | a0b1c42951dd06ec83cc1bc2c9788131d9fefcd8 [diff] |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mips-for-linux-next
Conflicts:
include/linux/ssb/ssb_driver_gige.h
Also resolves a logical merge conflict in drivers/net/ethernet/broadcom/-
bgmac.c due to change of an API.