summaryrefslogtreecommitdiffstats
path: root/kernel
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2012-07-241-12/+18
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-07-1917-212/+478
| |\
| * \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-07-054-96/+228
| |\ \
| * | | netlink: add netlink_kernel_cfg parameter to netlink_kernel_createPablo Neira Ayuso2012-06-291-2/+5
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-06-2813-131/+393
| |\ \ \
| * | | | audit: netlink: Move away from NLMSG_NEW().David S. Miller2012-06-261-10/+13
| * | | | ipv4: Don't add deprecated new binary sysctl value.David S. Miller2012-06-221-2/+0
| * | | | ipv4: Add sysctl knob to control early socket demuxAlexander Duyck2012-06-221-0/+2
* | | | | Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/v...Linus Torvalds2012-07-238-87/+77
|\ \ \ \ \
| * | | | | deal with task_work callbacks adding more workAl Viro2012-07-221-12/+14
| * | | | | move exit_task_work() past exit_files() et.al.Al Viro2012-07-222-23/+13
| * | | | | merge task_work and rcu_head, get rid of separate allocation for keyring caseAl Viro2012-07-222-9/+9
| * | | | | trim task_work: get rid of hlistAl Viro2012-07-222-32/+34
| * | | | | trimming task_work: kill ->dataAl Viro2012-07-221-1/+1
| * | | | | signal: make sure we don't get stopped with pending task_workAl Viro2012-07-221-0/+15
| * | | | | VFS: Pass mount flags to sget()David Howells2012-07-141-1/+1
| * | | | | VFS: Make clone_mnt()/copy_tree()/collect_mounts() return errorsDavid Howells2012-07-141-5/+5
| * | | | | get rid of kern_path_parent()Al Viro2012-07-141-22/+3
| * | | | | stop passing nameidata to ->lookup()Al Viro2012-07-141-2/+2
* | | | | | Merge tag 'pm-for-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/r...Linus Torvalds2012-07-227-29/+157
|\ \ \ \ \ \
| * | | | | | PM / Sleep: Require CAP_BLOCK_SUSPEND to use wake_lock/wake_unlockRafael J. Wysocki2012-07-191-0/+7
| * | | | | | Merge branch 'fixes' into pm-sleepRafael J. Wysocki2012-07-1816-204/+478
| |\ \ \ \ \ \
| * | | | | | | PM / Hibernate: Print hibernation/thaw progress indicator one line at a time.Bojan Smojver2012-07-011-27/+27
| * | | | | | | PM / Sleep: Separate printing suspend times from initcall_debugRafael J. Wysocki2012-07-012-34/+46
| * | | | | | | PM / Sleep: add knob for printing device resume timesSameer Nanda2012-07-011-0/+33
| * | | | | | | ftrace: Disable function tracing during suspend/resume and hibernation, againSrivatsa S. Bhat2012-07-012-0/+9
| * | | | | | | PM / Hibernate: Enable suspend to both for in-kernel hibernation.Bojan Smojver2012-07-013-0/+67
* | | | | | | | Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2012-07-224-361/+432
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'linus' into timers/coreIngo Molnar2012-07-181-0/+1
| |\ \ \ \ \ \ \ \
| * | | | | | | | | time: Rework timekeeping functions to take timekeeper ptr as argumentJohn Stultz2012-07-151-105/+103
| * | | | | | | | | time: Move xtime_nsec adjustment underflow handling timekeeping_adjustJohn Stultz2012-07-151-21/+21
| * | | | | | | | | time: Move arch_gettimeoffset() usage into timekeeping_get_ns()John Stultz2012-07-151-19/+10
| * | | | | | | | | time: Refactor accumulation of nsecs to secsJohn Stultz2012-07-151-22/+32
| * | | | | | | | | time: Condense timekeeper.xtime into xtime_secJohn Stultz2012-07-151-71/+110
| * | | | | | | | | time: Explicitly use u32 instead of int for shift valuesJohn Stultz2012-07-151-3/+3
| * | | | | | | | | time: Whitespace cleanups per Ingo%27s requestsJohn Stultz2012-07-151-21/+18
| * | | | | | | | | Merge branch 'timers/urgent' into timers/coreThomas Gleixner2012-07-1522-394/+1061
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'nohz-for-tip-2' of git://github.com/fweisbec/linux-dynticks int...Thomas Gleixner2012-06-119-167/+310
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | nohz: Move next idle expiry time record into idle logic areaFrederic Weisbecker2012-06-111-10/+14
| | * | | | | | | | | | nohz: Move ts->idle_calls incrementation into strict idle logicFrederic Weisbecker2012-06-111-39/+47
| | * | | | | | | | | | nohz: Rename ts->idle_tick to ts->last_tickFrederic Weisbecker2012-06-112-4/+4
| | * | | | | | | | | | nohz: Make nohz API agnostic against idle ticks cputime accountingFrederic Weisbecker2012-06-111-15/+22
| | * | | | | | | | | | nohz: Separate idle sleeping time accounting from nohz logicFrederic Weisbecker2012-06-111-35/+42
| | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| * | | | | | | | | | timers: Improve get_next_timer_interrupt()Thomas Gleixner2012-06-061-5/+8
| * | | | | | | | | | timers: Add accounting of non deferrable timersThomas Gleixner2012-06-061-8/+23
| * | | | | | | | | | timers: Consolidate base->next_timer updateThomas Gleixner2012-06-061-11/+15
| * | | | | | | | | | timers: Create detach_if_pending() and use itThomas Gleixner2012-06-061-33/+23
* | | | | | | | | | | Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2012-07-222-22/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | smpboot: Remove leftover declarationThomas Gleixner2012-06-111-2/+0
| * | | | | | | | | | | smp: Remove ipi_call_lock[_irq]()/ipi_call_unlock[_irq]()Yong Zhang2012-06-051-20/+0