summaryrefslogtreecommitdiffstats
path: root/drivers/pci/probe.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2013-04-24 20:33:46 +0200
committerThomas Gleixner <tglx@linutronix.de>2013-04-24 20:33:54 +0200
commit6402c7dc2a19c19bd8cdc7d80878b850da418942 (patch)
treecda2ea2df40442e2aa016119f3548cc504127ea8 /drivers/pci/probe.c
parenttimekeeping: Update tk->cycle_last in resume (diff)
parentLinux 3.9-rc8 (diff)
downloadlinux-6402c7dc2a19c19bd8cdc7d80878b850da418942.tar.xz
linux-6402c7dc2a19c19bd8cdc7d80878b850da418942.zip
Merge branch 'linus' into timers/core
Reason: Get upstream fixes before adding conflicting code. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/pci/probe.c')
0 files changed, 0 insertions, 0 deletions