summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next/alchemy' into mips-for-linux-nextRalf Baechle2012-01-1198-5753/+6637
|\
| * MIPS: Alchemy: Update cpu-feature-overridesManuel Lauss2011-12-081-0/+3
| * MIPS: Alchemy: db1200: Improve PB1200 detection.Manuel Lauss2011-12-081-8/+22
| * MIPS: Alchemy: merge Au1000 and Au1300-style IRQ controller code.Manuel Lauss2011-12-083-587/+550Star
| * MIPS: Alchemy: chain IRQ controllers to MIPS IRQ controllerManuel Lauss2011-12-082-49/+39Star
| * MIPS: Alchemy: irq: register pm at irq init timeManuel Lauss2011-12-082-96/+91Star
| * MIPS: Alchemy: Touchscreen support on DB1100Manuel Lauss2011-12-081-0/+56
| * MIPS: Alchemy: Hook up IrDA on DB1000/DB1100Manuel Lauss2011-12-081-17/+57
| * net/irda: convert au1k_ir to platform driver.Manuel Lauss2011-12-084-709/+700Star
| * MIPS: Alchemy: remove unused board headersManuel Lauss2011-12-083-139/+0Star
| * MTD: nand: make au1550nd.c a platform_driverManuel Lauss2011-12-083-175/+205
| * MIPS: Alchemy: Add RTC device to all devboardsManuel Lauss2011-12-075-60/+11Star
| * MIPS: Alchemy: MMC for DB1100Manuel Lauss2011-12-071-0/+202
| * MIPS: Alchemy: one kernel for DB1000/DB1500/DB1100Manuel Lauss2011-12-0710-431/+390Star
| * MIPS: Alchemy: Merge PB1200 support into DB1200 code.Manuel Lauss2011-12-078-818/+238Star
| * MIPS: Alchemy: move au1200fb global functions to platform dataManuel Lauss2011-12-075-200/+213
| * MIPS: Alchemy: merge devboard code into single per-board files.Manuel Lauss2011-12-0719-748/+464Star
| * MIPS: Alchemy: merge GPR/MTX-1/XXS1500 board code into single filesManuel Lauss2011-12-0715-555/+326Star
| * MIPS: Alchemy: Improved DB1550 support, with audio and serial busses.Manuel Lauss2011-12-0710-176/+763
| * MIPS: Alchemy: Basic support for the DB1300 board.Manuel Lauss2011-12-0715-19/+1398
| * MIPS: Alchemy: Au1300 SoC supportManuel Lauss2011-12-0724-47/+1514
| * MIPS: Alchemy: devboards: remove unneeded BCSR IRQ reg accManuel Lauss2011-12-071-9/+2Star
| * MIPS: Alchemy: Drop MIRAGE/BOSPORUS board supportManuel Lauss2011-12-076-203/+3Star
| * MIPS: Alchemy: remove PB1000 supportManuel Lauss2011-12-0714-1319/+2Star
* | Merge branch 'next/generic' into mips-for-linux-nextRalf Baechle2012-01-1152-174/+990
|\ \
| * | MIPS: Delete unused function add_temporary_entry.Ralf Baechle2012-01-112-58/+0Star
| * | MIPS: Set default pci cache line size.Ralf Baechle2012-01-111-1/+28
| * | MIPS: Flush huge TLBHillf Danton2012-01-112-6/+22
| * | MIPS: irq: Remove IRQF_DISABLEDYong Zhang2011-12-0735-46/+40Star
| * | MIPS: Handle initmem in systems with kernel not in add_memory_region() memDavid Daney2011-12-074-14/+47
| * | MIPS: Add fast get_user_pagesHillf Danton2011-12-072-2/+317
| * | MIPS: Hugetlb: Keep TLB cache hot while flushingHillf Danton2011-12-071-1/+1
| * | MIPS: GIO bus support for SGI IP22/28Thomas Bogendoerfer2011-12-076-46/+534
| |/
* | Merge branch 'fixes-for-linus' into mips-for-linux-nextRalf Baechle2012-01-1126-116/+122
|\ \ | |/ |/|
| * MIPS: Fix Jazz 64-bit build error.Ralf Baechle2011-12-077-6/+15
| * MIPS: Fix up inconsistency in panic() string argument.Ralf Baechle2011-12-0719-40/+40
| * MIPS: Alchemy: Fix PCI PMManuel Lauss2011-12-071-70/+67Star
|/
* Linux 3.2-rc4Linus Torvalds2011-12-011-1/+1
* Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2011-12-0131-536/+995
|\
| * ocfs2: avoid unaligned access to dqc_bitmapAkinobu Mita2011-12-012-5/+52
| * ocfs2: Use filemap_write_and_wait() instead of write_inode_now()Jan Kara2011-11-171-1/+1
| * ocfs2: honor O_(D)SYNC flag in fallocateMark Fasheh2011-11-171-0/+3
| * ocfs2: Add a missing journal credit in ocfs2_link_credits() -v2Xiaowei.Hu2011-11-171-2/+3
| * ocfs2: send correct UUID to cleancache initializationDan Magenheimer2011-11-171-1/+1
| * ocfs2: Commit transactions in error cases -v2Wengang Wang2011-11-173-6/+9
| * ocfs2: make direntry invalid when deleting itWengang Wang2011-11-171-2/+1Star
| * fs/ocfs2/dlm/dlmlock.c: free kmem_cache_zalloc'd data using kmem_cache_freeJulia Lawall2011-11-171-1/+1
| * Merge branch 'mw-3.1-jul25' of git://oss.oracle.com/git/smushran/linux-2.6 in...Joel Becker2011-08-224577-119139/+261695
| |\
| | * ocfs2: Implement llseek()Sunil Mushran2011-07-253-2/+151
| | * ocfs2: Fix ocfs2_page_mkwrite()Wengang Wang2011-07-242-37/+67