summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2006-12-1130-604/+657
|\
| * [NETPOLL]: Fix local_bh_enable() warning.Andrew Morton2006-12-111-2/+4
| * [IPVS]: Make ip_vs_sync.c <= 80col wide.Simon Horman2006-12-111-3/+6
| * [IPVS]: Use msleep_interruptable() instead of ssleep() aka msleep()Simon Horman2006-12-111-4/+4
| * [HAMRADIO]: Fix baycom_epp.c compile failure.Ralf Baechle2006-12-113-2/+4
| * [DCCP]: Whitespace cleanupsArnaldo Carvalho de Melo2006-12-1113-137/+149
| * [DCCP] ccid3: Fixup some type conversions related to rttsArnaldo Carvalho de Melo2006-12-112-12/+12
| * [DCCP] ccid3: BUG-FIX - conversion errorsGerrit Renker2006-12-111-24/+30
| * [DCCP] ccid3: Reorder packet history source fileGerrit Renker2006-12-111-107/+112
| * [DCCP] ccid3: Reorder packet history header fileGerrit Renker2006-12-111-60/+67
| * [DCCP] ccid3: Make debug output consistentGerrit Renker2006-12-111-35/+32
| * [DCCP] ccid3: Perform history operations only after packet has been sentGerrit Renker2006-12-111-29/+9
| * [DCCP] ccid3: TX history - remove unused fieldGerrit Renker2006-12-112-3/+3
| * [DCCP] ccid3: Shift window counter computationGerrit Renker2006-12-111-20/+29
| * [DCCP] ccid3: Sanity-check RTT samplesGerrit Renker2006-12-112-1/+13
| * [DCCP] ccid3: Initialise RTT valuesGerrit Renker2006-12-111-1/+2
| * [DCCP] ccid: Deprecate ccid_hc_tx_insert_optionsGerrit Renker2006-12-113-27/+0
| * [DCCP]: Warn when discarding packet due to internal errorsGerrit Renker2006-12-111-2/+4
| * [DCCP]: Only deliver to the CCID rx side in chargeGerrit Renker2006-12-112-7/+20
| * [DCCP]: Simplify TFRC calculationGerrit Renker2006-12-113-35/+35
| * [DCCP]: Debug timeval operationsGerrit Renker2006-12-112-24/+33
| * [DCCP] ccid3: Simplify calculation for reverse lookup of pGerrit Renker2006-12-111-17/+22
| * [DCCP] ccid3: Replace scaled division operationsGerrit Renker2006-12-111-24/+3
| * [DCCP] ccid3: Finer-grained resolution of sending ratesGerrit Renker2006-12-113-39/+78
| * [DCCP] ccid3: Fix two bugs in sending rate computationGerrit Renker2006-12-111-2/+2
| * [DCCP] ccid3: Two optimisations for sending rate recomputationGerrit Renker2006-12-111-11/+16
| * [DCCP] ccid3: Check against too large pGerrit Renker2006-12-111-4/+9
| * [DCCP]: Update documentationIan McDonald2006-12-111-4/+2
| * [DCCP]: Remove timeo from output.cIan McDonald2006-12-112-22/+6
| * [NETPOLL]: Make sure TX lock is taken with BH disabled.Andrew Morton2006-12-111-15/+19
| * [ATM]: Ignore generated file pca200e_ecd.bin2Ralf Baechle2006-12-111-1/+1
| * [NET]: Fix WAN routers kconfig dependency.Randy Dunlap2006-12-111-2/+3
| * [CRYPTO] sha512: Fix sha384 block sizeHerbert Xu2006-12-111-1/+1
* | Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32Linus Torvalds2006-12-1114-420/+341
|\ \
| * | [AVR32] Add missing #include <linux/param.h> to delay.cHaavard Skinnemoen2006-12-081-0/+1
| * | [AVR32] Pass dev parameter to dma_cache_sync()Haavard Skinnemoen2006-12-081-6/+6
| * | [AVR32] Implement intc_get_pending()Haavard Skinnemoen2006-12-081-0/+4
| * | [AVR32] Don't include <asm/delay.h>Haavard Skinnemoen2006-12-082-2/+1
| * | [AVR32] Put the chip in "stop" mode when halting the systemHaavard Skinnemoen2006-12-081-0/+7
| * | [AVR32] Set flow handler for external interruptsHaavard Skinnemoen2006-12-081-2/+20
| * | [AVR32] Remove unused fileHaavard Skinnemoen2006-12-081-289/+0
| * | [AVR32] Remove mii_phy_addr and eth_addr from eth_platform_dataHaavard Skinnemoen2006-12-082-11/+57
| * | [AVR32] Move ethernet tag parsing to board-specific codeHaavard Skinnemoen2006-12-082-32/+23
| * | [AVR32] Add macb1 platform_deviceHaavard Skinnemoen2006-12-081-0/+38
| * | [AVR32] Portmux API updateHaavard Skinnemoen2006-12-084-88/+194
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpcLinus Torvalds2006-12-1156-631/+1884
|\ \ \
| * | | [POWERPC] Generic BUG for powerpcJeremy Fitzhardinge2006-12-118-134/+69
| * | | Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/gala...Paul Mackerras2006-12-1112-47/+64
| |\ \ \
| | * | | [PPC] Fix compile failure do to introduction of PHY_POLLKumar Gala2006-12-101-0/+1
| | * | | Merge branch '85xx' into for_paulusKumar Gala2006-12-105-38/+42
| | |\ \ \
OpenPOWER on IntegriCloud