summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2012-06-0221-84/+201
|\
| * fec_mpc52xx: fix timestamp filteringStephan Gatzka2012-06-021-1/+1
| * mcs7830: Implement link state detectionOndrej Zary2012-06-021-2/+23
| * e1000e: fix Rapid Start Technology support for i217Bruce Allan2012-06-021-9/+9
| * e1000: look into the page instead of skb->data for e1000_tbi_adjust_stats()Sebastian Andrzej Siewior2012-06-021-1/+1
| * r8169: call netif_napi_del at errpaths and at driver unloadDevendra Naga2012-06-011-0/+3
| * tcp: reflect SYN queue_mapping into SYNACK packetsEric Dumazet2012-06-012-6/+12
| * tcp: do not create inetpeer on SYNACK messageEric Dumazet2012-06-011-1/+2
| * 8139cp/8139too: terminate the eeprom access with the right opmodeJason Wang2012-06-012-2/+2
| * 8139cp: set ring address before enabling receiverJason Wang2012-06-011-11/+11
| * cipso: handle CIPSO options correctly when NetLabel is disabledPaul Moore2012-06-011-1/+28
| * net: sock: validate data_len before allocating skb in sock_alloc_send_pskb()Jason Wang2012-05-311-2/+5
| * bql: Avoid possible inconsistent calculation.Hiroaki SHIMODA2012-05-311-5/+7
| * bql: Avoid unneeded limit decrement.Hiroaki SHIMODA2012-05-311-2/+4
| * bql: Fix POSDIFF() to integer overflow aware.Hiroaki SHIMODA2012-05-311-1/+1
| * net/mlx4_core: Fix obscure mlx4_cmd_box parameter in QUERY_DEV_CAPJack Morgenstein2012-05-311-3/+2
| * net/mlx4_core: Check port out-of-range before using in mlx4_slave_capJack Morgenstein2012-05-311-3/+3
| * net/mlx4_core: Fixes for VF / Guest startup flowJack Morgenstein2012-05-314-14/+63
| * net/mlx4_en: Fix improper use of "port" parameter in mlx4_en_eventJack Morgenstein2012-05-311-5/+7
| * net/mlx4_core: Fix number of EQs used in ICM initialisationMarcel Apfelbaum2012-05-313-15/+17
| * net/mlx4_core: Fix the slave_id out-of-range test in mlx4_eq_intJack Morgenstein2012-05-311-1/+1
* | Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2012-06-0211-39/+297
|\ \
| * \ Merge remote-tracking branch 'rostedt/tip/perf/urgent-2' into x86-urgent-for-...H. Peter Anvin2012-06-016-16/+154
| |\ \
| | * | ftrace/x86: Do not change stacks in DEBUG when calling lockdepSteven Rostedt2012-05-311-3/+41
| | * | x86: Allow nesting of the debug stack IDT settingSteven Rostedt2012-05-311-1/+7
| | * | x86: Reset the debug_stack update counterSteven Rostedt2012-05-311-2/+4
| | * | ftrace: Use breakpoint method to update ftrace callerSteven Rostedt2012-05-311-16/+72
| | * | ftrace: Synchronize variable setting with breakpointsSteven Rostedt2012-05-313-6/+42
| * | | x86, x32, ptrace: Remove PTRACE_ARCH_PRCTL for x32H.J. Lu2012-06-011-6/+0
| * | | x86, efi: Add EFI boot stub documentationMatt Fleming2012-06-012-0/+67
| * | | x86, efi; Add EFI boot stub console supportMatt Fleming2012-06-012-16/+75
| * | | x86, efi: Only close open files in error pathMatt Fleming2012-06-011-1/+1
* | | | tty: Revert the tty locking series, it needs more workLinus Torvalds2012-06-0214-191/+119
| | | |
| \ \ \
*-. \ \ \ Merge 'for-linus' branches from git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2012-06-022-2/+2
|\ \ \ \ \
| | * | | | frv: Remove bogus closing parenthesisGeert Uytterhoeven2012-06-021-1/+1
| * | | | | powerpc: Fix size of st_nlink on 64bitAnton Blanchard2012-06-021-1/+1
| |/ / / /
* | | | | Merge branch 'akpm' (Fixups for Andrew's patchbomb)Linus Torvalds2012-06-0113-45/+33
|\ \ \ \ \
| * | | | | nls: fix (and rename) mac NLS table files and config optionsLinus Torvalds2012-06-0113-33/+33
| * | | | | fs/nls/Makefile: remove bogus CONFIG_ assignmentsAndrew Morton2012-06-011-12/+0
* | | | | | Merge tag 'fbdev-updates-for-3.5' of git://github.com/schandinat/linux-2.6Linus Torvalds2012-06-0194-2155/+5467
|\ \ \ \ \ \
| * | | | | | video: bfin_adv7393fb: Fix cleanup codeEmil Goode2012-05-291-20/+23
| * | | | | | video: exynos_dp: reduce delay time when configuring video settingJingoo Han2012-05-291-2/+2
| * | | | | | video: exynos_dp: move sw reset prioir to enabling sw defined functionJingoo Han2012-05-293-2/+8
| * | | | | | video: exynos_dp: use devm_ functionsJingoo Han2012-05-292-38/+12
| * | | | | | fb: handle NULL pointers in framebuffer releaseDan Carpenter2012-05-291-0/+2
| * | | | | | Merge tag 'omapdss-for-3.5' of git://github.com/tomba/linux into fbdev-nextFlorian Tobias Schandinat2012-05-27606-5696/+7901
| |\ \ \ \ \ \
| | * | | | | | OMAPDSS: HDMI: OMAP4: Update IRQ flags for the HPD IRQ requestRicardo Neri2012-05-221-3/+3
| | * | | | | | OMAPDSS: Apply VENC timings even if panel is disabledArchit Taneja2012-05-221-0/+2
| | * | | | | | OMAPDSS: VENC/DISPC: Delay dividing Y resolution for managers connected to VENCArchit Taneja2012-05-222-18/+17
| | * | | | | | OMAPDSS: DISPC: Support rotation through TILERChandrabhanu Mahapatra2012-05-225-3/+87