summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* watchdog: hpwdt (12/12): Make NMI decoding a compile-time optiondann frazier2010-08-132-7/+37
* watchdog: hpwdt (11/12): move NMI-decoding init and exit to seperate functionsdann frazier2010-08-131-55/+69
* watchdog: hpwdt (10/12): Use "decoding" instead of "sourcing"dann frazier2010-08-131-10/+10
* watchdog: hpwdt (9/12): hpwdt_pretimeout reorganizationdann frazier2010-08-131-17/+19
* watchdog: hpwdt (8/12): implement WDIOC_GETTIMELEFTdann frazier2010-08-131-0/+9
* watchdog: hpwdt (7/12): allow full range of timer values supported by hardwaredann frazier2010-08-131-2/+3
* watchdog: hpwdt (6/12): Introduce SECS_TO_TICKS() macrodann frazier2010-08-131-2/+3
* watchdog: hpwdt (5/12): Make x86 assembly ifdef guard more strictdann frazier2010-08-131-6/+5Star
* watchdog: hpwdt (4/12): Despecificate driver from iLO2dann frazier2010-08-132-8/+8
* watchdog: hpwdt (3/12): Group NMI sourcing specific items togetherdann frazier2010-08-131-25/+24Star
* 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/+2Star
* 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/+0Star
| * | | 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/+34Star
| * | | ocfs2/dlm: fix a dead lockWengang Wang2010-08-071-3/+2Star
| * | | 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/+7Star
| | * | | | | 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/+49Star
| * | | | | | perf, x86: P4 PMU -- update nmi irq statistics and unmask lvt entry properlyCyrill Gorcunov2010-08-081-3/+6
| |/ / / / /