summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'fbdev-for-3.8' of git://gitorious.org/linux-omap-dss2/linuxLinus Torvalds2012-12-156-151/+147
|\
| * Merge tag 'omapdss-for-3.8' of git://gitorious.org/linux-omap-dss2/linux into...Tomi Valkeinen2012-12-132-10/+163
| |\
| | * OMAPDSS: export dispc functionsTomi Valkeinen2012-12-071-0/+39
| | * OMAPDSS: export dss_feat functionsTomi Valkeinen2012-12-071-0/+8
| | * OMAPDSS: export dss_mgr_ops functionsTomi Valkeinen2012-12-071-0/+29
| | * OMAPDSS: move omap_dispc_wait_for_irq_interruptible_timeout to dispc-compat.cTomi Valkeinen2012-12-071-4/+0
| | * OMAPDSS: add omapdss_compat_init()Tomi Valkeinen2012-12-071-0/+3
| | * Merge tag 'v3.7-rc4'Tomi Valkeinen2012-11-1692-2501/+2804
| | |\
| | * \ Merge branch '3.8/misc-2'Tomi Valkeinen2012-11-051-3/+3
| | |\ \
| | | * | OMAPDSS: export dss_get_def_display_name()Tomi Valkeinen2012-10-291-0/+1
| | | * | OMAPDSS: get the dss version from core pdevTomi Valkeinen2012-10-241-0/+2
| | | * | OMAPDSS: remove omap_dss_device's suspend/resumeTomi Valkeinen2012-10-241-3/+0
| | * | | OMAPDSS: Remove acb and acbi fields from omap_dss_deviceArchit Taneja2012-10-221-4/+0
| | |/ /
| | * | Merge branch '3.8/vrfb-conversion'Tomi Valkeinen2012-10-181-0/+68
| | |\ \
| * | \ \ Merge branch 'samsung-fb-next' of git://github.com/jingoo/linux into for-linusTomi Valkeinen2012-11-291-116/+52
| |\ \ \ \
| | * | | | video: s3c-fb: add the bit definitions for VIDCON0_VIDOUT_WBJingoo Han2012-11-261-1/+4
| | * | | | video: s3c-fb: move the bit definitions for DITHMODE registerJingoo Han2012-11-261-22/+20
| | * | | | video: s3c-fb: move the bit definitions for WINxMAP and WPALCON registerJingoo Han2012-11-261-16/+6
| | * | | | video: s3c-fb: move the bit definitions for VIDINTCON0 registerJingoo Han2012-11-261-6/+4
| | * | | | video: s3c-fb: move the address definition for VIDOSD registerJingoo Han2012-11-261-4/+3
| | * | | | video: s3c-fb: move the address definitions for VIDTCON registersJingoo Han2012-11-261-5/+3
| | * | | | video: s3c-fb: clean the bit definition for WINCON registerJingoo Han2012-11-261-63/+13
| * | | | | Merge branch 'fbdev-next' of github.com:timur-tabi/linux-2.6 into for-linusTomi Valkeinen2012-11-271-0/+9
| |\ \ \ \ \
| | * | | | | drivers/video: fsl-diu-fb: add support for set_gamma ioctlsTimur Tabi2012-11-261-0/+9
| * | | | | | da8xx-fb: cleanup LCDC configurationsManjunathappa, Prakash2012-11-271-21/+1
| * | | | | | da8xx-fb: adopt fb_videomode data for panel informationManjunathappa, Prakash2012-11-271-0/+3
| * | | | | | Merge branch 'lcdc-next' of git://linuxtv.org/pinchartl/fbdev into for-linusTomi Valkeinen2012-11-272-4/+1
| |\ \ \ \ \ \
| | * | | | | | fbdev: sh_mobile_lcdc: Remove unused get_brightness pdata callbackLaurent Pinchart2012-11-211-1/+0
| | * | | | | | fbdev: sh_mipi_dsi: Remove the unused sh_mipi_dsi_info lcd_chan fieldLaurent Pinchart2012-11-211-3/+0
| | * | | | | | fbdev: sh_mipi_dsi: Add channel field to platform dataLaurent Pinchart2012-11-211-0/+1
| | | |/ / / / | | |/| | | |
* | | | | | | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cool...Linus Torvalds2012-12-151-0/+17
|\ \ \ \ \ \ \
| * | | | | | | led: Add dependency on CONFIG_LEDS_TRIGGERS to led_trigger_rename_static()Jingoo Han2012-11-261-18/+17
| * | | | | | | leds: add led_trigger_rename functionFabio Baltieri2012-11-261-0/+18
| |/ / / / / /
* | | | | | | Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/j...Linus Torvalds2012-12-152-2/+5
|\ \ \ \ \ \ \
| * | | | | | | Revert "libata: check SATA_SETTINGS log with HW Feature Ctrl"Jeff Garzik2012-12-141-1/+0
| * | | | | | | pata_platform: remove unused remove functionBrian Norris2012-12-031-2/+0
| * | | | | | | libata: implement ata_platform_remove_one()Brian Norris2012-12-031-0/+4
| * | | | | | | libata: check SATA_SETTINGS log with HW Feature CtrlShane Huang2012-12-031-0/+1
| * | | | | | | libata: restore acpi disable functionalityAaron Lu2012-12-031-0/+1
* | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Linus Torvalds2012-12-154-10/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | crypto: cast5/cast6 - move lookup tables to shared moduleJussi Kivilinna2012-12-063-10/+11
| * | | | | | | | crypto: vmac - Make VMAC work when blocks aren't alignedSalman Qazi2012-10-151-0/+2
* | | | | | | | | Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2012-12-142-1/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | of: *node argument to of_parse_phandle_with_args should be constGuennadi Liakhovetski2012-12-111-1/+1
| * | | | | | | | | of/i2c: add dummy inline functions for when CONFIG_OF_I2C(_MODULE) isn't definedGuennadi Liakhovetski2012-12-111-0/+12
* | | | | | | | | | Merge tag 'mvebu' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-12-142-6/+27
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge tag 'mvebu_everything_for_3.8' of git://git.infradead.org/users/jcooper...Olof Johansson2012-11-302-6/+27
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| | * | | | | | | | | dma: mv_xor: remove the pool_size from platform_dataThomas Petazzoni2012-11-201-1/+0
| | * | | | | | | | | dma: mv_xor: remove hw_id field from platform_dataThomas Petazzoni2012-11-201-1/+0
| | * | | | | | | | | dma: mv_xor: change the driver name to 'mv_xor'Thomas Petazzoni2012-11-201-1/+1