summaryrefslogtreecommitdiffstats
path: root/drivers/net/mdio.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-09-25 17:59:04 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-09-25 17:59:04 +0200
commite2aad1d5716c5f7fa5deb4a96e6b6a4e9f24e78b (patch)
tree389fbdf161a3c28c9b2f98fdc1ccd89d474ef884 /drivers/net/mdio.c
parentMerge tag 'iio-for-3.13a' of git://git.kernel.org/pub/scm/linux/kernel/git/ji... (diff)
parentLinux 3.12-rc2 (diff)
downloadlinux-e2aad1d5716c5f7fa5deb4a96e6b6a4e9f24e78b.tar.xz
linux-e2aad1d5716c5f7fa5deb4a96e6b6a4e9f24e78b.zip
Merge 3.12-rc2 into staging-next.
This resolves the merge problem with two iio drivers that Stephen Rothwell pointed out. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/mdio.c')
0 files changed, 0 insertions, 0 deletions