aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/gianfar_ethtool.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2009-08-27 16:42:07 +0200
committerThomas Gleixner <tglx@linutronix.de>2009-08-27 16:42:32 +0200
commit6effcd92454ca5d7021b74f89fcac75209e146f9 (patch)
tree6a3ebef5074ca4721f8f36fe85b9287a16ba2a01 /drivers/net/gianfar_ethtool.c
parent10f02d1168585edf66229bb2ec90a42f32667a78 (diff)
parentac5672f82c39ff2f8dce81bf3e68b1dfc41f366f (diff)
Merge branch 'x86/paravirt' into x86/cleanups
Reason: The setup cleanups conflict with the paravirt cleanups. Avoid a rather large merge conflict Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/net/gianfar_ethtool.c')
0 files changed, 0 insertions, 0 deletions