]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'trivial/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Apr 2012 02:03:00 +0000 (12:03 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Apr 2012 02:03:00 +0000 (12:03 +1000)
commit1765ca2ef5ed6866ddf1432848db3a56d371bbd4
tree992c3e6d4c59e1e89c8621fbce4dc6e24738194f
parent545e315c48b1d0d6cad927d8ba20b0da080d6aab
parent409a3e98132c3a4f2aa2854995f8a9dd16cf11ac
Merge remote-tracking branch 'trivial/for-next'

Conflicts:
drivers/net/ethernet/realtek/r8169.c
MAINTAINERS
drivers/net/ethernet/realtek/r8169.c
sound/pci/hda/patch_realtek.c