summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* watchdog: hpwdt (2/12): Group options that affect watchdog behavior togetherdann frazier2010-08-131-3/+3
* watchdog: hpwdt (1/12): clean-up include-files.dann frazier2010-08-131-10/+2
* Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6Linus Torvalds2010-08-139-10/+41
|\
| * [S390] partitions: fix build error in ibm partition detection codeHeiko Carstens2010-08-131-1/+1
| * [S390] appldata: fix dev_get_stats 64 bit conversionHeiko Carstens2010-08-131-1/+2
| * [S390] wire up prlimit64 and fanotify* syscallsHeiko Carstens2010-08-133-1/+31
| * [S390] zcrypt: fix Kconfig dependenciesHeiko Carstens2010-08-131-1/+1
| * [S390] sys_personality: follow u_long to unsigned int conversionHeiko Carstens2010-08-133-4/+4
| * [S390] dasd: fix format string typesHeiko Carstens2010-08-131-2/+2
* | Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2010-08-1315-14/+22
|\ \
| * | V4L/DVB: v4l2-ctrls.c: needs to include slab.hRandy Dunlap2010-08-121-0/+1
| * | V4L/DVB: fix Kconfig to depends on VIDEO_IRMauro Carvalho Chehab2010-08-1210-10/+10
| * | V4L/DVB: Fix IR_CORE dependenciesMauro Carvalho Chehab2010-08-124-4/+11
* | | Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/o...Linus Torvalds2010-08-136-93/+122
|\ \ \
| * | | O2net: Disallow o2net accept connection request from itself.Tristan Ye2010-08-071-5/+12
| * | | ocfs2/dlm: remove potential deadlock -V3Wengang Wang2010-08-071-4/+0
| * | | ocfs2/dlm: avoid incorrect bit set in refmap on recovery masterWengang Wang2010-08-072-25/+31
| * | | Fix the nested PR lock calling issue in ACLJiaju Zhang2010-08-071-3/+21
| * | | ocfs2: Count more refcount records in file system fragmentation.Tao Ma2010-08-071-5/+15
| * | | ocfs2 fix o2dlm dlm run purgelist (rev 3)Srinivas Eeda2010-08-071-46/+34
| * | | ocfs2/dlm: fix a dead lockWengang Wang2010-08-071-3/+2
| * | | ocfs2: do not overwrite error codes in ocfs2_init_aclTiger Yang2010-08-071-2/+7
* | | | Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2010-08-1333-1091/+1705
|\ \ \ \
| * | | | perf: Add back list_head data typesIngo Molnar2010-08-121-0/+12
| * | | | Merge branch 'linus' into perf/urgentIngo Molnar2010-08-127977-357632/+506034
| |\ \ \ \
| * \ \ \ \ Merge branch 'perf/core' into perf/urgentIngo Molnar2010-08-1122-1009/+1270
| |\ \ \ \ \
| | * | | | | perf ui hist browser: Fixup key bindingsArnaldo Carvalho de Melo2010-08-101-8/+7
| | * | | | | perf ui browser: Add ui_browser__show counterpart: __hideArnaldo Carvalho de Melo2010-08-107-15/+33
| | * | | | | perf annotate: Cycle thru sorted lines with samplesArnaldo Carvalho de Melo2010-08-101-25/+77
| | * | | | | perf ui: Make SPACE work as PGDN in all browsersArnaldo Carvalho de Melo2010-08-102-1/+1
| | * | | | | perf annotate: Sort by hottest lines in the TUIArnaldo Carvalho de Melo2010-08-104-46/+125
| | * | | | | perf ui: Complete the breakdown of util/newt.cArnaldo Carvalho de Melo2010-08-1010-78/+96
| | * | | | | perf ui: Move hists browser to util/ui/browsers/Arnaldo Carvalho de Melo2010-08-104-954/+967
| | * | | | | perf symbols: Ignore mapping symbols on ARMDave Martin2010-08-101-0/+10
| | * | | | | perf ui: Move map browser to util/ui/browsers/Arnaldo Carvalho de Melo2010-08-104-155/+175
| | * | | | | perf ui: Move annotate browser to util/ui/browsers/Arnaldo Carvalho de Melo2010-08-106-131/+151
| | * | | | | perf ui: Move ui_progress routines to separate file in util/ui/Arnaldo Carvalho de Melo2010-08-105-59/+74
| | * | | | | perf ui: Move ui_helpline routines to separate file in util/ui/Arnaldo Carvalho de Melo2010-08-104-37/+55
| | * | | | | perf ui: Shorten ui_browser member namesArnaldo Carvalho de Melo2010-08-103-50/+49
| * | | | | | perf, x86: P4 PMU -- update nmi irq statistics and unmask lvt entry properlyCyrill Gorcunov2010-08-081-3/+6
| |/ / / / /
| * | | | | perf ui: Start breaking down newt.c into multiple filesArnaldo Carvalho de Melo2010-08-074-304/+368
| * | | | | perf tui: Introduce list_head based generic ui_browser refresh routineArnaldo Carvalho de Melo2010-08-062-25/+32
| * | | | | perf probe: Fix memory leaks in add_perf_probe_eventsMasami Hiramatsu2010-08-061-3/+8
| * | | | | perf probe: Fix to copy the type for raw parametersMasami Hiramatsu2010-08-061-2/+6
| * | | | | Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acm...Ingo Molnar2010-08-069-40/+297
| |\ \ \ \ \
| | * | | | | perf report: Speed up exit pathArnaldo Carvalho de Melo2010-08-061-1/+12
| | * | | | | perf timechart: Adjust confusing if indentationJulia Lawall2010-08-061-2/+2
| | * | | | | perf trace: Clean up #includesAndrea Gelmini2010-08-061-12/+7
| | * | | | | perf probe: Remove duplicated #includeAndrea Gelmini2010-08-061-1/+0
| | * | | | | perf ui: Add search by name/addr to the map__browserArnaldo Carvalho de Melo2010-08-062-10/+117