summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cg...Linus Torvalds2012-05-2218-438/+687
|\
| * res_counter: Account max_usage when calling res_counter_charge_nofail()Frederic Weisbecker2012-04-271-1/+1
| * res_counter: Merge res_counter_charge and res_counter_charge_nofailFrederic Weisbecker2012-04-273-42/+37
| * cgroups: disallow attaching kthreadd or PF_THREAD_BOUND threadsMike Galbraith2012-04-231-0/+13
| * cgroup: remove cgroup_subsys->populate()Tejun Heo2012-04-112-4/+0
| * cgroup: get rid of populate for memcgGlauber Costa2012-04-101-10/+13
| * cgroup: pass struct mem_cgroup instead of struct cgroup to socket memcgGlauber Costa2012-04-105-32/+24
| * cgroup: make css->refcnt clearing on cgroup removal optionalTejun Heo2012-04-013-9/+80
| * cgroup: use negative bias on css->refcnt to block css_tryget()Tejun Heo2012-04-012-56/+75
| * cgroup: implement cgroup_rm_cftypes()Tejun Heo2012-04-012-10/+45
| * cgroup: introduce struct cfentTejun Heo2012-04-012-36/+78
| * cgroup: relocate __d_cgrp() and __d_cft()Tejun Heo2012-04-011-10/+10
| * cgroup: remove cgroup_add_file[s]()Tejun Heo2012-04-012-47/+20
| * cgroup: convert memcg controller to the new cftype interfaceTejun Heo2012-04-012-15/+13
| * memcg: always create memsw files if CONFIG_CGROUP_MEM_RES_CTLR_SWAPTejun Heo2012-04-011-34/+31
| * cgroup: convert all non-memcg controllers to the new cftype interfaceTejun Heo2012-04-018-75/+28
| * cgroup: relocate cftype and cgroup_subsys definitions in controllersTejun Heo2012-04-014-83/+65
| * cgroup: merge cft_release_agent cftype array into the base files arrayTejun Heo2012-04-011-12/+7
| * cgroup: implement cgroup_add_cftypes() and friendsTejun Heo2012-04-012-3/+162
| * cgroup: build list of all cgroups under a given cgroupfs_rootTejun Heo2012-04-012-0/+12
| * cgroup: move cgroup_clear_directory() call out of cgroup_populate_dir()Tejun Heo2012-04-011-4/+2
| * cgroup: deprecate remount option changesTejun Heo2012-04-012-0/+14
* | Merge branch 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/pe...Linus Torvalds2012-05-2225-124/+69
|\ \
| * | percpu: remove percpu_xxx() functionsAlex Shi2012-05-142-64/+6
| * | x86: replace percpu_xxx funcs with this_cpu_xxxAlex Shi2012-05-1422-52/+55
| * | net: replace percpu_xxx funcs with this_cpu_xxx or __this_cpu_xxxAlex Shi2012-05-142-8/+8
* | | Merge branch 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wqLinus Torvalds2012-05-225-306/+38
|\ \ \
| * | | lockdep: fix oops in processing workqueuePeter Zijlstra2012-05-153-2/+24
| * | | workqueue: skip nr_running sanity check in worker_enter_idle() if trustee is ...Tejun Heo2012-05-141-2/+7
| * | | workqueue: Catch more locking problems with flush_work()Stephen Boyd2012-04-231-0/+3
| * | | workqueue: change BUG_ON() to WARN_ON()Dan Carpenter2012-04-161-1/+4
| * | | trace: Remove unused workqueue tracerStephen Boyd2012-04-112-301/+0
* | | | Merge tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2012-05-22611-25614/+27821
|\ \ \ \
| * | | | Staging: bcm: Remove two unused variables from Adapter.hKevin McKinney2012-05-181-2/+0
| * | | | Staging: bcm: Removes the volatile type definition from Adapter.hKevin McKinney2012-05-181-2/+2
| * | | | Staging: bcm: Rename all "INT" to "int" in Adapter.hKevin McKinney2012-05-181-11/+11
| * | | | Staging: bcm: Fix warning: __packed vs. __attribute__((packed)) in Adapter.hKevin McKinney2012-05-181-6/+6
| * | | | Staging: bcm: Correctly format all comments in Adapter.hKevin McKinney2012-05-181-62/+67
| * | | | Staging: bcm: Fix all whitespace issues in Adapter.hKevin McKinney2012-05-181-374/+342
| * | | | Staging: bcm: Properly format braces in Adapter.hKevin McKinney2012-05-181-52/+26
| * | | | Staging: ipack/bridges/tpci200: remove unneeded castsSamuel Iglesias Gonsalvez2012-05-181-20/+16
| * | | | Staging: ipack/bridges/tpci200: remove TPCI200_SHORTNAME constantSamuel Iglesias Gonsalvez2012-05-182-39/+33
| * | | | Staging: ipack: remove board_name and bus_name fields from struct ipack_deviceSamuel Iglesias Gonsalvez2012-05-183-24/+8
| * | | | Staging: ipack: improve the register of a bus and a device in the bus.Samuel Iglesias Gonsalvez2012-05-185-117/+131
| * | | | staging: comedi: cleanup all the comedi_driver 'detach' functionsH Hartley Sweeten2012-05-18109-993/+236
| * | | | staging: comedi: remove all 'default N' in KconfigH Hartley Sweeten2012-05-181-135/+4
| * | | | staging: line6/config.h: Delete unused headerJohannes Thumshirn2012-05-181-43/+0
| * | | | staging: gdm72xx depends on NETRandy Dunlap2012-05-171-0/+1
| * | | | staging: gdm72xx: Set up parent link in sysfs for gdm72xx devicesPaul Stewart2012-05-174-4/+5
| * | | | staging: drm/omap: initial dmabuf/prime import supportRob Clark2012-05-173-0/+26