git.karo-electronics.de Git - karo-tx-linux.git/log

Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'

Conflicts:
arch/powerpc/include/asm/Kbuild
arch/powerpc/include/uapi/asm/Kbuild
arch/powerpc/include/uapi/asm/epapr_hcalls.h

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 03:01:05 +0000 (14:01 +1100)]

Merge remote-tracking branch 'kvm/linux-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 02:53:39 +0000 (13:53 +1100)]

Merge remote-tracking branch 'rcu/rcu/next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 02:46:09 +0000 (13:46 +1100)]

Merge remote-tracking branch 'tip/auto-latest'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 02:44:34 +0000 (13:44 +1100)]

Merge remote-tracking branch 'spi-mb/spi-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 02:42:54 +0000 (13:42 +1100)]

Merge remote-tracking branch 'dt-rh/for-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 02:41:09 +0000 (13:41 +1100)]

Merge remote-tracking branch 'edac-amd/for-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 02:39:24 +0000 (13:39 +1100)]

Merge remote-tracking branch 'edac/linux_next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 02:37:45 +0000 (13:37 +1100)]

Merge remote-tracking branch 'fsnotify/for-next'

Conflicts:
kernel/audit_tree.c

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 02:30:10 +0000 (13:30 +1100)]

Merge remote-tracking branch 'pm/linux-next'

Conflicts:
arch/x86/pci/acpi.c

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 02:28:22 +0000 (13:28 +1100)]

Merge remote-tracking branch 'trivial/for-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 02:26:39 +0000 (13:26 +1100)]

Merge remote-tracking branch 'osd/linux-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 02:21:29 +0000 (13:21 +1100)]

Merge remote-tracking branch 'iommu/next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 02:19:39 +0000 (13:19 +1100)]

Merge remote-tracking branch 'watchdog/master'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 02:19:33 +0000 (13:19 +1100)]

Merge remote-tracking branch 'selinux/master'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 02:12:41 +0000 (13:12 +1100)]

Merge remote-tracking branch 'security/next'

Conflicts:
fs/cifs/cifsacl.c
net/dns_resolver/dns_key.c
security/keys/keyctl.c
security/keys/keyring.c
security/keys/process_keys.c

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 02:10:55 +0000 (13:10 +1100)]

Merge remote-tracking branch 'regulator/for-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 02:09:10 +0000 (13:09 +1100)]

Merge remote-tracking branch 'mfd/for-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 02:07:30 +0000 (13:07 +1100)]

Merge remote-tracking branch 'md/for-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 02:00:09 +0000 (13:00 +1100)]

Merge remote-tracking branch 'slab/for-next'

Conflicts:
mm/slob.c

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 01:59:58 +0000 (12:59 +1100)]

Merge remote-tracking branch 'kgdb/kgdb-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 01:58:25 +0000 (12:58 +1100)]

Merge remote-tracking branch 'mmc/mmc-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 01:56:40 +0000 (12:56 +1100)]

Merge branch 'device-mapper/master'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 01:55:00 +0000 (12:55 +1100)]

Merge remote-tracking branch 'block/for-next'

Conflicts:
drivers/block/floppy.c
init/Kconfig

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 01:50:38 +0000 (12:50 +1100)]

Merge remote-tracking branch 'cgroup/for-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 01:49:00 +0000 (12:49 +1100)]

Merge remote-tracking branch 'input/next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 01:47:23 +0000 (12:47 +1100)]

Merge remote-tracking branch 'virtio/virtio-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 01:40:38 +0000 (12:40 +1100)]

Merge remote-tracking branch 'modules/modules-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 01:38:58 +0000 (12:38 +1100)]

Merge remote-tracking branch 'sound-asoc/for-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 01:37:04 +0000 (12:37 +1100)]

Merge remote-tracking branch 'sound/for-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 01:35:19 +0000 (12:35 +1100)]

Merge remote-tracking branch 'drm/drm-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 01:33:42 +0000 (12:33 +1100)]

Merge remote-tracking branch 'crypto/master'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 01:32:05 +0000 (12:32 +1100)]

Merge remote-tracking branch 'l2-mtd/master'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 01:30:24 +0000 (12:30 +1100)]

Merge remote-tracking branch 'mtd/master'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 01:28:49 +0000 (12:28 +1100)]

Merge remote-tracking branch 'bluetooth/master'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 01:26:47 +0000 (12:26 +1100)]

Merge remote-tracking branch 'wireless-next/master'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 01:19:28 +0000 (12:19 +1100)]

Merge remote-tracking branch 'net-next/master'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 01:15:29 +0000 (12:15 +1100)]

Merge remote-tracking branch 'slave-dma/next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 01:13:44 +0000 (12:13 +1100)]

Merge remote-tracking branch 'target-updates/for-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 01:08:34 +0000 (12:08 +1100)]

Merge remote-tracking branch 'swiotlb/linux-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 01:06:59 +0000 (12:06 +1100)]

Merge remote-tracking branch 'dlm/next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 01:05:25 +0000 (12:05 +1100)]

Merge remote-tracking branch 'ubi/linux-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 01:03:48 +0000 (12:03 +1100)]

Merge remote-tracking branch 'thermal/next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 01:03:40 +0000 (12:03 +1100)]

Merge remote-tracking branch 'cpuidle/cpuidle-next'

Conflicts:
drivers/cpuidle/coupled.c
include/linux/cpuidle.h

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 00:57:12 +0000 (11:57 +1100)]

Merge remote-tracking branch 'acpi/next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 00:57:00 +0000 (11:57 +1100)]

Merge remote-tracking branch 'kbuild/for-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 00:53:50 +0000 (11:53 +1100)]

Merge commit 'refs/next/20121026/v4l-dvb'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 00:48:29 +0000 (11:48 +1100)]

Merge remote-tracking branch 'hwmon-staging/hwmon-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 00:46:59 +0000 (11:46 +1100)]

Merge branch 'jdelvare-hwmon/master'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 00:46:58 +0000 (11:46 +1100)]

Merge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 00:45:30 +0000 (11:45 +1100)]

Merge branch 'i2c/master'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 00:43:54 +0000 (11:43 +1100)]

Merge remote-tracking branch 'hid/for-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 00:40:30 +0000 (11:40 +1100)]

Merge remote-tracking branch 'pci/next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 00:39:03 +0000 (11:39 +1100)]

Merge remote-tracking branch 'vfs/for-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 00:37:31 +0000 (11:37 +1100)]

Merge remote-tracking branch 'xfs/for-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 00:35:51 +0000 (11:35 +1100)]

Merge remote-tracking branch 'ubifs/linux-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 00:35:44 +0000 (11:35 +1100)]

Merge remote-tracking branch 'v9fs/for-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 00:33:53 +0000 (11:33 +1100)]

Merge remote-tracking branch 'ocfs2/linux-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 00:32:17 +0000 (11:32 +1100)]

Merge remote-tracking branch 'nfs/linux-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 00:30:38 +0000 (11:30 +1100)]

Merge remote-tracking branch 'logfs/master'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 00:29:07 +0000 (11:29 +1100)]

Merge remote-tracking branch 'gfs2/master'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 00:27:28 +0000 (11:27 +1100)]

Merge remote-tracking branch 'fuse/for-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 00:25:53 +0000 (11:25 +1100)]

Merge remote-tracking branch 'cifs/for-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 00:24:12 +0000 (11:24 +1100)]

Merge remote-tracking branch 'ceph/master'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 00:22:44 +0000 (11:22 +1100)]

Merge remote-tracking branch 'xtensa/for_next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 00:21:17 +0000 (11:21 +1100)]

Merge remote-tracking branch 'unicore32/unicore32'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 00:19:45 +0000 (11:19 +1100)]

Merge remote-tracking branch 's390/features'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 00:18:16 +0000 (11:18 +1100)]

Merge remote-tracking branch 'mpc5xxx/next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 00:18:14 +0000 (11:18 +1100)]

Merge remote-tracking branch 'parisc/for-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 00:16:43 +0000 (11:16 +1100)]

Merge remote-tracking branch 'openrisc/for-upstream'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 00:15:13 +0000 (11:15 +1100)]

Merge remote-tracking branch 'mips/mips-for-linux-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 00:13:44 +0000 (11:13 +1100)]

Merge remote-tracking branch 'microblaze/next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 00:12:15 +0000 (11:12 +1100)]

Merge remote-tracking branch 'm68knommu/for-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 00:10:40 +0000 (11:10 +1100)]

Merge remote-tracking branch 'cris/for-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 00:09:10 +0000 (11:09 +1100)]

Merge remote-tracking branch 'blackfin/for-linus'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 00:07:39 +0000 (11:07 +1100)]

Merge remote-tracking branch 'arm64/upstream'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 00:06:09 +0000 (11:06 +1100)]

Merge remote-tracking branch 'xilinx/arm-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 00:04:41 +0000 (11:04 +1100)]

Merge remote-tracking branch 'arm-perf/for-next/perf'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 00:02:49 +0000 (11:02 +1100)]

Merge remote-tracking branch 'arm/for-next'

commit | commitdiff | tree

Stephen Rothwell [Thu, 8 Nov 2012 00:01:15 +0000 (11:01 +1100)]

Merge remote-tracking branch 'asm-generic/master'

commit | commitdiff | tree

Stephen Rothwell [Wed, 7 Nov 2012 23:59:40 +0000 (10:59 +1100)]

Merge remote-tracking branch 'rr-fixes/fixes'

commit | commitdiff | tree

Stephen Rothwell [Wed, 7 Nov 2012 23:59:28 +0000 (10:59 +1100)]

Merge remote-tracking branch 'spi-current/spi/merge'

commit | commitdiff | tree

Stephen Rothwell [Wed, 7 Nov 2012 23:59:15 +0000 (10:59 +1100)]

Merge remote-tracking branch 'devicetree-current/devicetree/merge'

commit | commitdiff | tree

Stephen Rothwell [Wed, 7 Nov 2012 23:59:04 +0000 (10:59 +1100)]

Merge remote-tracking branch 'crypto-current/master'

commit | commitdiff | tree

Stephen Rothwell [Wed, 7 Nov 2012 23:59:00 +0000 (10:59 +1100)]

Merge remote-tracking branch 'usb.current/usb-linus'

commit | commitdiff | tree

Stephen Rothwell [Wed, 7 Nov 2012 23:58:59 +0000 (10:58 +1100)]

Merge remote-tracking branch 'pci-current/for-linus'

commit | commitdiff | tree

Stephen Rothwell [Wed, 7 Nov 2012 23:58:58 +0000 (10:58 +1100)]

Merge remote-tracking branch 'sound-current/for-linus'

commit | commitdiff | tree

Stephen Rothwell [Wed, 7 Nov 2012 23:58:57 +0000 (10:58 +1100)]

Merge remote-tracking branch 'net/master'

commit | commitdiff | tree

Stephen Rothwell [Wed, 7 Nov 2012 23:58:57 +0000 (10:58 +1100)]

Merge remote-tracking branch 'sparc/master'

commit | commitdiff | tree

Stephen Rothwell [Wed, 7 Nov 2012 23:58:55 +0000 (10:58 +1100)]

Merge remote-tracking branch 'kbuild-current/rc-fixes'

commit | commitdiff | tree

Bjorn Helgaas [Wed, 7 Nov 2012 22:53:38 +0000 (15:53 -0700)]

Merge branch 'pci/mike-x86-tra' into next

* pci/mike-x86-tra:
x86/PCI: Allow x86 platforms to use translation offsets

commit | commitdiff | tree

Bjorn Helgaas [Wed, 7 Nov 2012 22:53:33 +0000 (15:53 -0700)]

Merge branch 'pci/taku-prt-cleanup' into next

* pci/taku-prt-cleanup:
  PCI/ACPI: Request _OSC control before scanning PCI root bus
  PCI: Don't pass pci_dev to pci_ext_cfg_avail()
  PCI/ACPI: Add _PRT interrupt routing info before enumerating devices
  ACPI: Pass segment/bus to _PRT add/del so they don't depend on pci_bus

commit | commitdiff | tree

Bjorn Helgaas [Wed, 7 Nov 2012 22:53:29 +0000 (15:53 -0700)]

Merge branch 'pci/yinghai-for-pci-root-bus-hotplug' into next

* pci/yinghai-for-pci-root-bus-hotplug:
  PCI/ACPI: Remove acpi_root_driver in reverse order
  PCI/ACPI: Delete host bridge _PRT during hot remove path
  PCI/ACPI: Make acpi_pci_root_remove() stop/remove pci root bus
  PCI: Add pci_stop_and_remove_root_bus()
  PCI/ACPI: Assign unassigned resource for hot-added root bus
  PCI: Move out pci_enable_bridges out of assign_unsigned_bus_res
  PCI: Move pci_rescan_bus() back to probe.c
  PCI: Separate out pci_assign_unassigned_bus_resources()

commit | commitdiff | tree

Bjorn Helgaas [Wed, 7 Nov 2012 22:53:24 +0000 (15:53 -0700)]

Merge branch 'pci/misc' into next

* pci/misc:
  x86/PCI: Allow x86 platforms to use translation offsets
  PCI/PM: Add comments for PME poll support for PCIe
  PCI: Add PLX PCI 9050 workaround for some Meilhaus DAQ cards
  PCI: Add workaround for PLX PCI 9050 BAR alignment erratum
  PCI: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
  x86/PCI: Ignore _SEG on HP xw9300
  PCI: Don't touch card regs after runtime suspend D3

Linux kernel for KaRo TX COM modules

RSS Atom