Merge branch 'depends/driver-core' into ux500/dt
authorArnd Bergmann <arnd@arndb.de>
Fri, 16 Mar 2012 19:15:48 +0000 (19:15 +0000)
committerArnd Bergmann <arnd@arndb.de>
Fri, 16 Mar 2012 19:15:48 +0000 (19:15 +0000)
commitab2f75ce55ef6f903348026271e30796f016851f
tree8e019d460e92ee6ac2b2ea54aa0b93770bf933ef
parentf56b71f5d5a3944acdcb0e5e1739574d95ddf61a
parentda5a70f3519fd6f73ece3eea261a861c9a4d6bbd
Merge branch 'depends/driver-core' into ux500/dt

Conflicts:
drivers/base/cpu.c
drivers/base/cpu.c
drivers/pci/xen-pcifront.c
drivers/pcmcia/ds.c
include/linux/hyperv.h
scripts/mod/file2alias.c