aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jb...Linus Torvalds2012-01-112-29/+20
|\
| * ia64/PCI: convert to pci_create_root_bus() for correct root bus resourcesBjorn Helgaas2012-01-061-25/+14
| * ia64/PCI: use pci_create_bus() instead of pci_scan_bus_parented()Bjorn Helgaas2012-01-061-1/+4
| * PCI: IA64: convert pcibios_set_master() to a non-inlined functionMyron Stowe2012-01-062-6/+5
* | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhostLinus Torvalds2012-01-101-4/+1
|\ \
| * | lib: move GENERIC_IOMAP to lib/KconfigMichael S. Tsirkin2011-11-241-4/+1
* | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommuLinus Torvalds2012-01-102-0/+3
|\ \ \
| * \ \ Merge branches 'iommu/page-sizes' and 'iommu/group-id' into nextJoerg Roedel2012-01-092-0/+3
| |\ \ \ | | |_|/ | |/| |
| | * | iommu: Add option to group multi-function devicesAlex Williamson2011-11-152-0/+3
| | |/
* | | Merge branch 'stable/for-linus-3.3' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2012-01-101-1/+1
|\ \ \
| * | | xen/ia64: fix build breakage because of conflicting u64 guest handlesLuck, Tony2011-11-301-1/+1
| | |/ | |/|
* | | Merge branch 'kvm-updates/3.3' of git://git.kernel.org/pub/scm/virt/kvm/kvmLinus Torvalds2012-01-101-7/+5
|\ \ \
| * | | KVM: IA64: fix struct redefinitionXiao Guangrong2011-12-271-2/+2
| * | | KVM: introduce id_to_memslot functionXiao Guangrong2011-12-271-1/+1
| * | | KVM: introduce kvm_for_each_memslot macroXiao Guangrong2011-12-271-4/+2
| |/ /
* | | Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2012-01-081-2/+0
|\ \ \
| * | | freezer: remove now unused TIF_FREEZETejun Heo2011-11-211-2/+0
| |/ /
* | | Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/vi...Linus Torvalds2012-01-083-31/+2
|\ \ \
| * | | consolidate a bunch of ipcbuf.h instancesAl Viro2012-01-031-28/+1
| * | | consolidate umode_t declarationsAl Viro2012-01-031-2/+0
| * | | vfs: for usbfs, etc. internal vfsmounts ->mnt_sb->s_root == ->mnt_rootAl Viro2012-01-031-1/+1
| | |/ | |/|
* | | Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2012-01-072-31/+31
|\ \ \
| * \ \ Merge branch 'driver-core-next' into Linux 3.2Greg Kroah-Hartman2012-01-062-31/+31
| |\ \ \ | | |/ / | |/| |
| | * | cpu: convert 'cpu' and 'machinecheck' sysdev_class to a regular subsystemKay Sievers2011-12-212-31/+31
| | |/
* | | Merge branch 'misc-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl...Linus Torvalds2012-01-064-7/+24
|\ \ \
| * | | ia64: pcibr: Use kmemdup rather than duplicating its implementationThomas Meyer2011-12-091-2/+1
| * | | ia64: sn: Use kmemdup rather than duplicating its implementationThomas Meyer2011-12-091-3/+2
| * | | ia64: tioca: Use kmemdup rather than duplicating its implementationThomas Meyer2011-12-091-2/+2
| * | | [IA64] Merge overlapping reserved regions at bootPetr Tesarik2011-12-091-0/+19
| | |/ | |/|
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2012-01-061-0/+3
|\ \ \
| * \ \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2011-12-301-0/+1
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2011-11-171-0/+3
| |\ \ \ | | |_|/ | |/| |
| | * | net: add wireless TX status socket optionJohannes Berg2011-11-091-0/+3
* | | | Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2012-01-061-38/+34
|\ \ \ \
| * | | | [S390] cputime: add sparse checking and cleanupMartin Schwidefsky2011-12-151-37/+32
| |/ / /
* | | | Merge branch 'core-memblock-for-linus' of git://git.kernel.org/pub/scm/linux/...Linus Torvalds2012-01-063-6/+7
|\ \ \ \ | |_|_|/ |/| | |
| * | | memblock: Kill early_node_map[]Tejun Heo2011-12-081-3/+0
| * | | ia64: Use HAVE_MEMBLOCK_NODE_MAPTejun Heo2011-12-083-3/+7
| |/ /
* | | procfs: do not confuse jiffies with cputime64_tAndreas Schwab2011-12-291-0/+1
|/ /
* | Merge branch 'upstream/xen-settime' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2011-11-061-0/+1
|\ \
| * | xen/acpi: Domain0 acpi parser related platform hypercallYu Ke2011-09-261-0/+1
* | | Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2011-11-0610-0/+10
|\ \ \
| * | | ia64: Add export.h to arch/ia64 specific files as requiredPaul Gortmaker2011-10-3110-0/+10
* | | | Merge branch 'stable/vmalloc-3.2' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2011-11-062-91/+0
|\ \ \ \
| * | | | xen: use generic functions instead of xen_{alloc, free}_vm_area()David Vrabel2011-09-292-91/+0
* | | | | Merge branch 'process_vm' of git://git.kernel.org/pub/scm/linux/kernel/git/ae...Linus Torvalds2011-11-042-1/+5
|\ \ \ \ \
| * | | | | [IA64] Wire up cross memory attach syscallsTony Luck2011-11-022-1/+5
| | |/ / / | |/| | |
* | | | | Merge branch 'misc-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl...Linus Torvalds2011-11-027-5/+14
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [IA64] gpio: GENERIC_GPIO default must be nBen Hutchings2011-09-011-1/+1
| * | | | [IA64[ add CONFIG_NET_VENDOR_INTEL=y to default config files where neededTony Luck2011-08-265-0/+5