aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jb...Linus Torvalds2012-01-114-38/+19
|\
| * sparc32, leon/PCI: convert to pci_scan_root_bus() for correct root bus resourcesBjorn Helgaas2012-01-061-17/+8
| * sparc/PCI: convert to pci_create_root_bus()Bjorn Helgaas2012-01-061-11/+6
| * PCI: SPARC: convert pcibios_set_master() to a non-inlined functionMyron Stowe2012-01-063-10/+5
* | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhostLinus Torvalds2012-01-104-25/+3
|\ \
| * | sparc: switch to GENERIC_PCI_IOMAPMichael S. Tsirkin2011-12-044-25/+3
* | | sparc: make SA_NOMASK a synonym of SA_NODEFERMatt Fleming2012-01-101-1/+2
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-nextLinus Torvalds2012-01-097-345/+6
|\ \ \
| * | | sparc32: remove unused file: include/asm/pgtsun4.hSam Ravnborg2011-12-301-171/+0
| * | | sparc32: fix PAGE_SIZE definitionSam Ravnborg2011-12-292-8/+4
| * | | sparc32: enable different preemptions modelsSam Ravnborg2011-12-291-2/+0
| * | | sparc32: support atomic64_tSam Ravnborg2011-12-272-0/+3
| * | | sparc32: drop useless preprocessor conditional in atomic_32.hSam Ravnborg2011-12-271-4/+0
| * | | sparc32: drop unused atomic24 supportSam Ravnborg2011-12-273-161/+0
| | |/ | |/|
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2012-01-081-1/+1
|\ \ \
| * | | treewide: Fix typos in various parts of the kernel, and fix some comments.Justin P. Mattock2011-12-021-1/+1
* | | | Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2012-01-082-4/+0
|\ \ \ \
| * \ \ \ Merge branch 'pm-sleep' into pm-for-linusRafael J. Wysocki2011-12-252-4/+0
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Merge branch 'master' into pm-sleepRafael J. Wysocki2011-12-213-9/+4
| | |\ \ \
| | * | | | freezer: remove now unused TIF_FREEZETejun Heo2011-11-212-4/+0
| | | |_|/ | | |/| |
* | | | | Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/vi...Linus Torvalds2012-01-082-8/+0
|\ \ \ \ \
| * | | | | consolidate umode_t declarationsAl Viro2012-01-032-8/+0
| |/ / / /
* | | | | Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2012-01-071-61/+61
|\ \ \ \ \
| * \ \ \ \ Merge branch 'driver-core-next' into Linux 3.2Greg Kroah-Hartman2012-01-061-61/+61
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | cpu: convert 'cpu' and 'machinecheck' sysdev_class to a regular subsystemKay Sievers2011-12-211-61/+61
* | | | | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/pow...Linus Torvalds2012-01-061-3/+3
|\ \ \ \ \ \
| * | | | | | powerpc+sparc64/mm: Remove hack in mmap randomize layoutDan McGee2011-11-281-3/+3
| | |_|/ / / | |/| | | |
* | | | | | 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-2/+2
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2011-12-233-9/+4
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2011-11-2115-323/+165
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | 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 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2012-01-062-3/+5
|\ \ \ \ \ \ \
| * | | | | | | nohz: Remove tick_nohz_idle_enter_norcu() / tick_nohz_idle_exit_norcu()Frederic Weisbecker2011-12-111-2/+4
| * | | | | | | sparc: Make SPARC use the new is_idle_task() APIPaul E. McKenney2011-12-111-1/+1
| * | | | | | | nohz: Allow rcu extended quiescent state handling seperately from tick stopFrederic Weisbecker2011-12-111-2/+2
| * | | | | | | nohz: Separate out irq exit and idle loop dyntick logicFrederic Weisbecker2011-12-111-2/+2
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'core-memblock-for-linus' of git://git.kernel.org/pub/scm/linux/...Linus Torvalds2012-01-063-36/+8
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Merge branch 'memblock-kill-early_node_map' of git://git.kernel.org/pub/scm/l...Ingo Molnar2011-12-203-36/+8
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | memblock: Kill early_node_map[]Tejun Heo2011-12-081-3/+0
| | * | | | | sparc: Use HAVE_MEMBLOCK_NODE_MAPTejun Heo2011-12-082-20/+5
| | * | | | | memblock: s/memblock_analyze()/memblock_allow_resize()/ and update usersTejun Heo2011-12-081-1/+1
| | * | | | | memblock: Kill memblock_init()Tejun Heo2011-12-081-2/+0
| | * | | | | memblock: Fix include breakages caused by 24aa07882bTejun Heo2011-12-081-8/+0
| | * | | | | Merge branch 'master' into x86/memblockTejun Heo2011-11-28132-1833/+2000
| | |\ \ \ \ \ | | | |/ / / /
| | * | | | | memblock: Don't allow archs to override memblock_nid_range()Tejun Heo2011-07-141-2/+2
* | | | | | | sparc64: Fix MSIQ HV call ordering in pci_sun4v_msiq_build_irq().David S. Miller2011-12-221-2/+2
|/ / / / / /
* | | | | | sparc32: Be less strict in matching %lo part of relocation.David S. Miller2011-12-141-2/+1
* | | | | | sparc: Use kmemdup rather than duplicating its implementationThomas Meyer2011-12-042-7/+3
| |/ / / / |/| | | |