summaryrefslogtreecommitdiff
path: root/include/linux
AgeCommit message (Collapse)Author
2011-04-04i2c: buses: tegra: assign unused address to i2c slaveNitin Kumbhar
New i2c slave should be configured with a non-zero i2c address. Configure i2c slave with an i2c address assigned by platform data for an i2c dev. BUG 788286 Reviewed-on: http://git-master/r/25100 (cherry picked from commit e6e0610c72ffce3b734e079faf88fad3f0468d07) Change-Id: I440aa2cc72007d2835b2027c0b26089d0aad9263 Reviewed-on: http://git-master/r/25223 Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-03-28serial: 8250: support auto control of RTSCTS on tegra typePradeep Goudagunta
Add UART_CAP_HW_CTSRTS flag to tegra type for supporting auto control of RTSCTS. Bug 803910 Change-Id: I7b69e4b203e66903ba5755338fcb55f4a87b9a43 Reviewed-on: http://git-master/r/24463 Tested-by: Pradeep Goudagunta <pgoudagunta@nvidia.com> Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-03-22video: pwm_backlight: Add check_fb hookRobert Morell
In systems with multiple framebuffer devices, one of the devices might be blanked while another is unblanked. In order for the backlight blanking logic to know whether to turn off the backlight for a particular framebuffer's blanking notification, it needs to be able to check if a given framebuffer device corresponds to the backlight. This plumbs the check_fb hook from core backlight through the pwm_backlight helper to allow platform code to plug in a check_fb hook. Originally reviewed on http://git-master/r/21716 Reviewed-on: http://git-master/r/23100 (cherry picked from commit c7831cb27fc6a2701b020676a6daf9c76e9470d9) Change-Id: I32895d6f2c5988b09680a350e169f1f3c9b56da6 Reviewed-on: http://git-master/r/23725 Reviewed-by: Robert Morell <rmorell@nvidia.com> Tested-by: Gaurav Sarode <gsarode@nvidia.com> Reviewed-by: Mayuresh Kulkarni <mkulkarni@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-03-22backlight: add low threshold to pwm backlightArun Murthy
The intensity of the backlight can be varied from a range of max_brightness to zero. Though most, if not all the pwm based backlight devices start flickering at lower brightness value. And also for each device there exists a brightness value below which the backlight appears to be turned off though the value is not equal to zero. If the range of brightness for a device is from zero to max_brightness. A graph is plotted for brightness Vs intensity for the pwm based backlight device has to be a linear graph. intensity | / | / | / |/ --------- 0 max_brightness But pratically on measuring the above we note that the intensity of backlight goes to zero(OFF) when the value in not zero almost nearing to zero(some x%). so the graph looks like intensity | / | / | / | | ------------ 0 x max_brightness In order to overcome this drawback knowing this x% i.e nothing but the low threshold beyond which the backlight is off and will have no effect, the brightness value is being offset by the low threshold value(retaining the linearity of the graph). Now the graph becomes intensity | / | / | / | / ------------- 0 max_brightness With this for each and every digit increment in the brightness from zero there is a change in the intensity of backlight. Devices having this behaviour can set the low threshold brightness(lth_brightness) and pass the same as platform data else can have it as zero. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Arun Murthy <arun.murthy@stericsson.com> Acked-by: Linus Walleij <linus.walleij@stericsson.com> Acked-by: Richard Purdie <rpurdie@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Reviewed-on: http://git-master/r/23099 (cherry picked from commit 92db79791aa60cacb3fa90d1cb2e942420c29408) Change-Id: Icbe49b593dfa6608934ff274b4c9281e43c30b5c Reviewed-on: http://git-master/r/23724 Tested-by: Gaurav Sarode <gsarode@nvidia.com> Reviewed-by: Mayuresh Kulkarni <mkulkarni@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-03-22misc: mpu3050: Invensense MPU code update v3.3.3vsalve
Update Invensense Motion Library (MPL) to production version v3.3.3. Previous version was engineering release and is not suitable for mass production. This version of the MPL most notably fixes problems with suspend/resume where touch screen would quit working during a suspend/resume cycle. Change-Id: Ia33433a677862b3d1e31d410aac7176d7a381a8f Reviewed-on: http://git-master/r/22987 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com>
2011-03-17[TPS658x RTC] Correct reg RTC_CTRL usageDavid Schalig
Correct PRE_BYPASS (clock scaler 32kHz/1kHz select) bitfield. Add platform data to tune RTC XTAL capacitance in board file. Bug 798832, Tested on Ventana/wake via Alarm Clock Change-Id: I82d67610a815866707fc1db934d7d4d7cf93d883 Reviewed-on: http://git-master/r/22402 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com> Reviewed-by: David Schalig <dschalig@nvidia.com> Reviewed-by: Jonathan Mayo <jmayo@nvidia.com>
2011-03-17regulator: tps6586x: add PFM/PWM options on SMs supplyXin Xie
TPS6586x SM0, SM1 and SM2 port have 2 power switching modes: - PWM only, or - PMW-PFM auto mode Some of TPS6586x have voltage spike in PFM-to-FWM transition can lockup the CPU if choose PWM-PFM auto mode. This patch enables such mode selection on SMs ports from the board level power configuration file. BUG 796364 Change-Id: I7015798151d6753ff5dcc329703338fde105e2b0 Reviewed-on: http://git-master/r/22701 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com> Reviewed-by: Xin Xie <xxie@nvidia.com> Tested-by: Xin Xie <xxie@nvidia.com>
2011-03-10mfd: max8907c: Add api to power off max8907cPrashant Gaikwad
Add an api to power off max8907c by setting power off bit in RESET_CNFG reg. Bug 799957 Bug 800602 (Cold boot) Change-Id: Ie0206d684a86fecc75273c1d3b087bb2d47b4c56 Reviewed-on: http://git-master/r/22385 Tested-by: Prashant Gaikwad <pgaikwad@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-03-09merge: trivial updates resolved from upstreamDan Willemsen
* Move include/linux/tegra_usb.h to include/linux/platform_data/tegra_usb.h Change-Id: I5b7799c5af8029b15ad206978718b337afac8814 Reviewed-on: http://git-master/r/22165 Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com> Tested-by: Daniel Willemsen <dwillemsen@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Reviewed-by: Nitin Kumbhar <nkumbhar@nvidia.com>
2011-03-08spi: tegra: Fixing misc issues.Laxman Dewangan
Following are the fixes; - Supportng half duplex. - Only using SW based CS. - Write to readback with command register does not work. Fixing issue. - Using cpu based transfer for smaller size and dma based for larger size. - reading proper transfer status after every transaction. bug 791149 bug 791780 Change-Id: I293b3f1b571276f5d8fe4ad4da67f827926e4b73 Reviewed-on: http://git-master/r/20581 Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com> Tested-by: Laxman Dewangan <ldewangan@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Reviewed-by: Amit Kamath <akamath@nvidia.com>
2011-03-07merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36Nitin Kumbhar
Conflicts: arch/arm/mach-tegra/include/mach/system.h arch/arm/mach-tegra/include/mach/usb_phy.h arch/arm/mach-tegra/usb_phy.c drivers/usb/host/ehci-tegra.c drivers/video/tegra/dc/dc.c drivers/video/tegra/dc/hdmi.c include/linux/tegra_usb.h Change-Id: Ic1f4f2b360893e8de6b867a8ecc239aca02367da
2011-03-03max8907c mfd: Add wake irq capabilityTom Cherry
This change allows the max8907c to wake the system when receiving an irq. It also masks all non-wake conditions from causing an irq when going into suspend and unmasks these conditions when resuming to not cause spurious wake-up events. Change-Id: I5eadb929ff4aded8a6ec11426ab424f0f692c042 Reviewed-on: http://git-master/r/20100 Tested-by: Thomas Cherry <tcherry@nvidia.com> Reviewed-by: Sachin Nikam <snikam@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-03-01Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36Colin Cross
2011-03-01usb: otg: Add ulpi viewport access opsBenoit Goby
Add generic access ops for controllers with a ulpi viewport register (e.g. Chipidea based controller). Change-Id: I53d50857d4716f8df708af199ad1def1ff9d4beb Signed-off-by: Benoit Goby <benoit@android.com>
2011-03-01usb: host: tegra: Cleanup before sending upstreamBenoit Goby
Change-Id: I846d43b1ecbe6c726f024b6a0fb318d6300a3746 Signed-off-by: Benoit Goby <benoit@android.com>
2011-03-01usb: host: Moved tegra_usb.h to include/linux/platform_dataBenoit Goby
Change-Id: Ic093d07858eb6e27aae9cd04d4c59407b5b1d76d Signed-off-by: Benoit Goby <benoit@android.com>
2011-02-23hwmon: adt7461: support Thermal ThrottlingPrashant Gaikwad
The driver now supports thermal throttling. When the temperature reaches a certain threshold, thermal throttling is enabled and when the chip cools off to a certain threshold, throttling is disabled. Bug 786378 Change-Id: I7e769bd98e0bfe0d1f2decdba4432f91a0133d54 Reviewed-on: http://git-master/r/20372 Tested-by: Prashant Gaikwad <pgaikwad@nvidia.com> Reviewed-by: Varun Wadekar <vwadekar@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-02-22video: tegra: Add PWM backlight driverJoseph Lehrer
bug 773671 Change-Id: Ib93f0dcb7e22220fe297c81d403c401548f3c649 Reviewed-on: http://git-master/r/18280 Tested-by: Joseph Lehrer <jlehrer@nvidia.com> Reviewed-by: Thomas Cherry <tcherry@nvidia.com> Reviewed-by: Jonathan Mayo <jmayo@nvidia.com> Reviewed-by: Sachin Nikam <snikam@nvidia.com> Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>
2011-02-22arm: tegra: hsuart: Support for Bluetooth wakeupPradeep Goudagunta
Added support to tegra_hsuart driver for bluetooth wakeup. Bug 773186 Change-Id: Id8f1face1b99942fd13949d0815a1dedd1a5a5d0 Reviewed-on: http://git-master/r/19586 Reviewed-by: Anantha Idapalapati <aidapalapati@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Anantha Idapalapati <aidapalapati@nvidia.com>
2011-02-21merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36Nitin Kumbhar
Conflicts: drivers/net/wireless/bcm4329/Makefile Change-Id: I5e6994d4db216062b9cd1673f45bd9fdcf1f96ae
2011-02-18usb: Adding USB CDC NCM class driver.Steve Lin
This driver supports devices conforming to the Communication Device Class (CDC) Network Control Model. The CDC specifications are available from <http://www.usb.org/>. This driver is implemented as a minidriver for usbnet driver framework. Bug 776360 Change-Id: If5e900f80edebc742536a59716aad546b714ba4c Reviewed-on: http://git-master/r/14921 Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-02-16merge: USB: remove duplicated usb_hcd_map_urb_for_dmaDan Willemsen
The original commit went upstream, this is to fix a merge issue from a slightly different version coming back. Change-Id: I69a58a483e58a0ee1a13521a466709f5cad6505f Reviewed-on: http://git-master/r/19663 Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com> Tested-by: Daniel Willemsen <dwillemsen@nvidia.com> Reviewed-by: Robert Morell <rmorell@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Reviewed-by: Nitin Kumbhar <nkumbhar@nvidia.com>
2011-02-16Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36Rebecca Schultz Zavin
2011-02-14net: wireless: Add get_country_code functionality to platformDmitry Shmidt
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-02-14Revert "Revert "mmc: subtract boot sectors from disk size for eMMC 4.3+ ↵Nitin Kumbhar
devices"" This reverts commit 6b53bad8ac54b3d748c4b0dbe6b0a4ed6e2e60f4.
2011-02-14merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36Nitin Kumbhar
Conflicts: drivers/usb/host/ehci-tegra.c include/linux/usb.h include/linux/usb/hcd.h Change-Id: I2499459b717e36a2a994af9d7a5ae1ecb5e7ca9c
2011-02-12Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36Colin Cross
2011-02-12Merge branch 'android-2.6.36' into android-tegra-2.6.36Colin Cross
2011-02-12Revert "mmc: subtract boot sectors from disk size for eMMC 4.3+ devices"Colin Cross
This reverts commit f0b0e4bec1e89014f3dcef4da8bcf95428cc771c. The reverted commit incorrectly calculates the size of eMMC devices in some (all?) cases. This revert may cause problems in cases where the bootloader was bug-compatible and puts a GPT partition at the incorrect end of the eMMC device. Change-Id: Ib006acf9e517b3b8f7570220c28e19c91e7b5f25 Signed-off-by: Colin Cross <ccross@android.com>
2011-02-11Revert "mmc: subtract boot sectors from disk size for eMMC 4.3+ devices"Colin Cross
This reverts commit 2cdc235bbeb09b2b78cd02a94ab79c265861aea9. The reverted commit incorrectly calculates the size of eMMC devices in some (all?) cases. This revert may cause problems in cases where the bootloader was bug-compatible and puts a GPT partition at the incorrect end of the eMMC device. Change-Id: Icc9ddb3d294aa2a1caeddfe8fedd2e12aa7691e1
2011-02-09USB: gadget: android: Support switching vendor ID when configuration changesMike Lockwood
Based on the list of enabled USB functions, we can now switch the vendor ID as well as the product ID. Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-09merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36Nitin Kumbhar
Conflicts: drivers/video/tegra/dc/hdmi.c Change-Id: Ia65c693bf49160e3906df68403129ba1e5545912
2011-02-08USB: HCD: Add driver hooks for (un)?map_urb_for_dmaRobert Morell
Provide optional hooks for the host controller driver to override the default DMA mapping and unmapping routines. In general, these shouldn't be necessary unless the host controller has special DMA requirements, such as alignment contraints. If these are not specified, the general usb_hcd_(un)?map_urb_for_dma functions will be used instead. Also, pass the status to unmap_urb_for_dma so it can know whether the DMA buffer has been overwritten. Finally, add a flag to be used by these implementations if they allocated a temporary buffer so it can be freed properly when unmapping. Signed-off-by: Robert Morell <rmorell@nvidia.com> Acked-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-08USB: HCD: Add usb_hcd prefix to exported functionsRobert Morell
The convention is to prefix symbols exported from the USB HCD core with "usb_hcd". This change makes unmap_urb_setup_for_dma() and unmap_urb_for_dma() consistent with that. Signed-off-by: Robert Morell <rmorell@nvidia.com> Acked-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-02-07Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36Erik Gilling
Change-Id: I6fcdbcd0eb7103ac580deb94faf79959a5818ba1
2011-02-07video: fbmon: add HDMI dectetion to fbmod edid parsingErik Gilling
Looks for ieee registration numver 0x000c03 as per HDMI spec. Change-Id: I6875b24c66e8754510edabcb4f9ba682a50d6ac1 Signed-off-by: Erik Gilling <konkers@android.com>
2011-02-04Driver: Misc: Sensors: MPU: enable kxtf9 and ak8975Wen Yi
BUG 771526 Corrected the mismatched CONFIG_SENSOR_KXTF9 and CONFIG_SENSOR_AK8975 to CONFIG_SENSOR_KXTF9_MPU and CONFIG_SENSOR_AK8975_MPU Change-Id: I760bfdd5cbdd91acdf9ce10ee5be5fcfa0a9c5ab Reviewed-on: http://git-master/r/18377 Reviewed-by: Wen Yi <wyi@nvidia.com> Tested-by: Wen Yi <wyi@nvidia.com> Reviewed-by: Robert R Collins <rcollins@nvidia.com> Tested-by: Robert R Collins <rcollins@nvidia.com> Reviewed-by: Jeremy Wyman <jwyman@nvidia.com> Tested-by: Jeremy Wyman <jwyman@nvidia.com> Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>
2011-02-04max8907c Charger DriverTom Cherry
max8907c Charger Driver from maxim plus nvidia modifications Integration from http://git-master/r/#change,15043 Change-Id: I8143fee9c99b43ad1089613236410dc8ad5bbca0 Reviewed-on: http://git-master/r/16134 Tested-by: Thomas Cherry <tcherry@nvidia.com> Reviewed-by: Sachin Nikam <snikam@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-02-03Port Invensense MPU3050 drivers into tegra-2.6.36Wen Yi
Change-Id: Iceb3ef8b11d4ce18fd3cb0947268744775b81758 Reviewed-on: http://git-master/r/17525 Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com> Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com>
2011-02-03arm: serial: tegra: add PORT_TEGRA port typePradeep Goudagunta
added new entry for PORT_TEGRA in serial8250 driver and updated flags and type of debug uart. Bug : 782543 Change-Id: I3e6c59f7a24731e92bd48197c6b1b22acdba8a8f Reviewed-on: http://git-master/r/17995 Tested-by: Pradeep Goudagunta <pgoudagunta@nvidia.com> Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com> Reviewed-by: Shail Dave <sdave@nvidia.com> Reviewed-by: Scott Williams <scwilliams@nvidia.com>
2011-02-02arm: tegra_hsuart: Add wake_peer operationNitin Kumbhar
Recently wake_peer op was added to uart_ops. Add this op for tegra_hsuart allowing a platform to implement peer specific wakeup. BUG 781303 Change-Id: Icfbac324815d7737c0e0820e57a2e8d844855ba0 Reviewed-on: http://git-master/r/17993 Tested-by: Nitin Kumbhar <nkumbhar@nvidia.com> Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-02-02mfd: tps6586x: fix alarm1 supportVarun Wadekar
instead of clearing the irq for alarm enable/disable, the proper bit in RTC_CONFIG has to be set/cleared. tps6586 does not support 1/sec update counter so remove support for update_irq_enable. replace it with alarm_irq_enable. Change-Id: Iee66a6625e810169253a750faf3f12d20d65d7d9 Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Reviewed-on: http://git-master/r/17990 Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-02-02max8907c MFD driver: add second i2c bus and irq handlingTom Cherry
Clean up portions of max8907c.c driver Add capability for bulk i2c read and write Add capability for second i2c bus for rtc Add capability for irq handling for rtc and battery charger Change-Id: I6c2c2c42591aee766635a2e32a7404bb2591f4a7 Reviewed-on: http://git-master/r/16613 Tested-by: Thomas Cherry <tcherry@nvidia.com> Reviewed-by: Sachin Nikam <snikam@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-01-28input: gpio-keys: report wakeup key on resumeNitin Kumbhar
During resume, gpio-keys does not get updated state of gpios which fails to report wakeup key event. Update resume routine to report key event based on wakeup source. BUG 745149 Change-Id: Iff7a9b431f9da8d226c8d3cd522725c3049fef07 Reviewed-on: http://git-master/r/17455 Tested-by: Nitin Kumbhar <nkumbhar@nvidia.com> Reviewed-by: Varun Wadekar <vwadekar@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-01-28i2c-tegra: Retry transfer when unexpected status is detectedJin Park
Sometimes unexpected status like I2C busy status, Tx FIFO interrupted and wait on Rx data etc is seen. Add a code to detect such conditions and return -EAGAIN from driver. This will cause the i2c-core to retry the transmission as per the retry count and time-out specified by the platform data of the adapter. Bug ID: 777455 Change-Id: Iac5971bca4d760d93cd2ed147f78fc2807315b4e Signed-off-by: Jin Park <jinyoungp@nvidia.com> Reviewed-on: http://git-master/r/16212 Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-01-27video: tegra: Multi client overlay managementDan Willemsen
This creates a new device node per head - /dev/tegra_dc%u. There are a number of ioctls in linux/tegra_overlay.h to open, close, and flip overlays. This is a replacement for the extensions in the tegra fb interface, but does not remove that functionality for compatibility reasons. Once everyone has moved, we can remove the tegra fb extensions. Change-Id: Id78a94482637a7ce229ec64eb5feaf2dec2b7804 Reviewed-on: http://git-master/r/16700 Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com> Tested-by: Daniel Willemsen <dwillemsen@nvidia.com>
2011-01-11hwmon: nct1008: delete driver codeVarun Wadekar
nct1008 driver will now reside in drivers/misc Bug 742230 Change-Id: I774c920cf96ded96ae440a99935f6cb9f1f63323 Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Reviewed-on: http://git-master/r/15496 Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-01-10[tegra alsa] Add routing supportSumit Bhattacharya
Add three alsa controls to expose selection of playback device, capture device and call mode.Alsa kernel will route pcm data to the selected output/input port. bug 771510 Change-Id: Ibdeebbd799b2ae36046a77327ec8b6a3b01553a9 Reviewed-on: http://git-master/r/14729 Tested-by: Sumit Bhattacharya <sumitb@nvidia.com> Reviewed-by: Sachin Nikam <snikam@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-01-10merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36Nitin Kumbhar
Conflicts: arch/arm/mach-tegra/fuse.c drivers/misc/Makefile Change-Id: I300b925d78b31efe00c342190d8dbd50e2e81230
2011-01-08Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36Colin Cross
Conflicts: drivers/misc/Kconfig drivers/misc/Makefile Change-Id: I826244513f799fdd2fb0269abad3271c96661293
generated by cgit v1.2.3 (git 2.0.4) at 2024-07-06 18:19:38 +0000